Commits · master · Ezekiel Elin / veloren · GitLab

Mar 13, 2022
- Merge branch 'imbris/fix-optional-command-parsing' into 'master' · 9a3b5d3e
  Imbris authored Mar 13, 2022
  9a3b5d3e
- Add note on reasoning in optional argument parsing behavior · 06b605a8
  Imbris authored Mar 13, 2022
  
  06b605a8
- Don't consume command args that fail parsing, so that optional args are properly skipped. · 008e9051
  Imbris authored Mar 13, 2022
  
  008e9051
- Merge branch 'galaipa/add-basque' into 'master' · bcd4a811
  Imbris authored Mar 13, 2022
  bcd4a811
- Merge branch 'imbris/small-fixed' into 'master' · 6d101419
  Imbris authored Mar 13, 2022
  6d101419
- Merge branch 'DaforLynx/town-music-returned' into 'master' · be9a4154
  Treeco authored Mar 13, 2022
  be9a4154
- Reinstate town music. · ff624dd6
  DaforLynx authored Mar 13, 2022 and Treeco committed Mar 13, 2022
  
  ff624dd6
- Merge branch 'DaforLynx/louder-rivers' into 'master' · 8072c9db
  Justin Shipsey authored Mar 13, 2022
  8072c9db
- Loud rivers · 7b6f424b
  DaforLynx authored Mar 13, 2022 and Justin Shipsey committed Mar 13, 2022
  
  7b6f424b
- Small logging filter directives refactor including removing: "ignoring ``:... · e00cd768
  Imbris authored Mar 13, 2022
  e00cd768
- Merge branch 'DaforLynx/fix-movement-sfx' into 'master' · 1ecd4a80
  Samuel Keiffer authored Mar 13, 2022
  1ecd4a80
- Fix swim sfx, fix glider sfx, add glide sfx · 123fee27
  DaforLynx authored Mar 13, 2022 and Samuel Keiffer committed Mar 13, 2022
  
  123fee27
- Merge branch 'isse/primitive-fixes' into 'master' · c5365c85
  Samuel Keiffer authored Mar 13, 2022
  c5365c85
- Primitive fixes · 7621a215
  Isse authored Mar 13, 2022 and Samuel Keiffer committed Mar 13, 2022
  
  7621a215
Mar 12, 2022
- Merge branch 'tormod-spread-towns-out' into 'master' · 5ee62788
  Joshua Barretto authored Mar 12, 2022
  5ee62788
- Prevent towns being placed in the ocean just off the coast. · 5f12163e
  Tormod G. Hellen authored Mar 12, 2022
  
  5f12163e
- Force incompatible sites further apart. · 5e3ef831
  Tormod G. Hellen authored Mar 12, 2022
  
  5e3ef831
- Increase quality of town placements. · afdb7fe9
  Tormod G. Hellen authored Mar 12, 2022
  
  afdb7fe9
- Force towns further apart. · 68072231
  Tormod G. Hellen authored Mar 12, 2022
  
  68072231
- Fix bug where chunks outside the map counted as occupied. · 031db61c
  Tormod G. Hellen authored Mar 12, 2022
  031db61c
Mar 09, 2022
- Merge branch 'isse/painter-spawn' into 'master' · 87b139d3
  Joshua Barretto authored Mar 09, 2022
  View commits for tag nightly nightly
  87b139d3
- Add entity spawn on painter · e21f04d4
  Isse authored Mar 09, 2022 and Joshua Barretto committed Mar 09, 2022
  
  e21f04d4
- Merge branch 'xMAC94x/client_lag' into 'master' · dfd1d3a2
  Marcel authored Mar 09, 2022
  dfd1d3a2
Mar 08, 2022
- put tracy in a seperate scope · 167e3321
  Marcel authored Mar 08, 2022
  
  167e3321
- Merge branch 'tygyh/Refactor-path_toward_target' into 'master' · a411db17
  Samuel Keiffer authored Mar 08, 2022
  a411db17
- Merge branch 'unvariant/trading_fix' into 'master' · d05cb990
  Marcel authored Mar 08, 2022
  d05cb990
- prevent glider and sneak from triggering during trade · 115b2875
  unvariant authored Mar 07, 2022
  
  115b2875
Mar 07, 2022
- Merge branch 'isse/map-marker-fixes' into 'master' · f6b805db
  Imbris authored Mar 07, 2022
  f6b805db
- Map marker fixes · a5ab36e6
  Isse authored Mar 07, 2022 and Imbris committed Mar 07, 2022
  
  a5ab36e6
Mar 05, 2022
- Merge branch 'christof/icetea_quickfix' into 'master' · 9fe45ddb
  Marcel authored Mar 05, 2022
  9fe45ddb
- crafting factor was wrongly used as well … · c3d6b8c2
  Christof Petig authored Mar 05, 2022
  
  c3d6b8c2
- hotfix for sunflow ice tea costing 16x the amount of its ingredients · d02018f8
  Christof Petig authored Mar 05, 2022
  d02018f8
- Merge branch 'christof/shredded_economy2' into 'master' · 5b13719c
  Marcel authored Mar 05, 2022
  5b13719c
- Economy redesign: Cleaner file structure (no code change) · 546afa86
  Christof Petig authored Mar 05, 2022 and Marcel committed Mar 05, 2022
  
  546afa86
- Remove redundant 'pos' variable · 18109986
  Jonathan Berglin authored Mar 05, 2022
  
  18109986
- Remove redundant if-statement · 1cb7a083
  Jonathan Berglin authored Mar 05, 2022
  
  1cb7a083
Mar 04, 2022
- Merge branch 'DaforLynx/music-fix' into 'master' · 4e116e46
  Samuel Keiffer authored Mar 04, 2022
  4e116e46
- Sorry Rarnage · 32434ec8
  DaforLynx authored Mar 04, 2022
  
  32434ec8
- Merge branch 'sam/vertical-melee' into 'master' · 3a359800
  Samuel Keiffer authored Mar 04, 2022
  3a359800
- More sensible vertical limit to what melee attacks can hit · bc7c088a
  Samuel Keiffer authored Mar 03, 2022
  
  bc7c088a