Commits · master · Ethan Jones / veloren · GitLab

Mar 15, 2021
- Merge branch 'aweinstock/tradefixes-20210314' into 'master' · 0049976d
  Forest Anderson authored Mar 15, 2021
  0049976d
- Client-side trade fixes: update recipe cache and always put client on the same... · 95992ead
  Avi Weinstock authored Mar 14, 2021
  95992ead
- Merge branch 'sam/yeet-inputs' into 'master' · 5570b572
  Marcel authored Mar 15, 2021
  5570b572
- Merge branch 'synis/fix-safezone-mass' into 'master' · 8cec35a9
  Forest Anderson authored Mar 15, 2021
  8cec35a9
- Merge branch 'snowram/new-npcs' into 'master' · a558d42d
  Imbris authored Mar 15, 2021
  a558d42d
Mar 14, 2021
- Merge branch 'imbris/ping-while-waiting-for-gamesync' into 'master' · 4e454d32
  Imbris authored Mar 14, 2021
  4e454d32
- Wielding now works again · ecff675c
  Samuel Keiffer authored Mar 14, 2021
  ecff675c
- Completely purged old method of inputs · ac6e192d
  Samuel Keiffer authored Mar 14, 2021
  
  ac6e192d
- Inputs remain in queue while active, allowing interrupts and queued inputs to... · be27289a
  Samuel Keiffer authored Mar 14, 2021
  be27289a
- Secondary input now fully functional · b5d50119
  Samuel Keiffer authored Mar 12, 2021
  
  b5d50119
- Primary ability fully functional. · 21e6f479
  Samuel Keiffer authored Mar 12, 2021
  
  21e6f479
- Support for canceling an input. Boost state hooked up to system. · 19c81f15
  Samuel Keiffer authored Mar 11, 2021
  
  19c81f15
- Primary input now activated from control actions. · c6d8daaa
  Samuel Keiffer authored Mar 05, 2021
  c6d8daaa
- Merge branch 'DaforLynx/upscale-tweak' into 'master' · b0a41704
  Marcel authored Mar 14, 2021
  b0a41704
- Added mass to safezone entity · 29d1dca0
  Synis authored Mar 14, 2021
  
  29d1dca0
- Renamed 'Upscale Factor' to 'Internal Resolution' as per what was decided in #981 · f924e047
  DaforLynx authored Mar 14, 2021
  
  f924e047
- Merge branch 'PersianKnight/DebugInfoHotKey_AxeSkillTree' into 'master' · 6ef459e8
  Imbris authored Mar 14, 2021
  6ef459e8
- to squash · de14e5bc
  Imbris authored Mar 14, 2021
  
  de14e5bc
- Keep connection alive while waiting for initial sync · 93e33eed
  Imbris authored Mar 14, 2021
  
  93e33eed
- Theropod charge attack · 60dd47cd
  Snowram authored Mar 14, 2021
  
  60dd47cd
- Bug fix debug info hotkey and axe skill tree text · b8751426
  PersianKnight authored Mar 14, 2021
  
  b8751426
- Add new npcs · 9d7e8957
  Snowram authored Mar 12, 2021
  
  9d7e8957
- Merge branch 'christof/trading_MVP' into 'master' · 72ca632a
  Imbris authored Mar 14, 2021
  72ca632a
- Implement /price_list (work in progress), stub for /buy and /sell · 15b11d91
  Christof Petig authored Mar 14, 2021 and Imbris committed Mar 14, 2021
  15b11d91
Mar 13, 2021
- Merge branch 'imbris/tracy-tweaks' into 'master' · fcdd7f1c
  Imbris authored Mar 13, 2021
  fcdd7f1c
- Merge branch 'PersianKnight/ImprovedSettings' into 'master' · bc75a8b7
  Imbris authored Mar 13, 2021
  bc75a8b7
- Fix tracy not working in certain areas, add span to chunk gen, missing fmt,... · 01278321
  Imbris authored Mar 13, 2021
  01278321
- Improve default value of windows_size in Graphics and Help Windows in Interface Settings. · 7c0fe704
  PersianKnight authored Mar 13, 2021
  
  7c0fe704
- The appearance of the reset buttons has improved. · 42d57ccb
  PersianKnight authored Mar 13, 2021
  
  42d57ccb
- Fixed Toggle Debug Info from Settings · e3c0ceb9
  PersianKnight authored Mar 13, 2021
  
  e3c0ceb9
- Merge branch 'imbris/fix-server' into 'master' · 0170acb4
  Imbris authored Mar 13, 2021
  0170acb4
- Fix server panic · 3c4829bc
  Imbris authored Mar 13, 2021
  
  3c4829bc
- Add tracy entity count plot, span tweaks · 2511b895
  Imbris authored Mar 13, 2021
  
  2511b895
- Move server-cli commands to separate file, tracy profiling par_join improvements, misc improvements · 8d0b776f
  Imbris authored Mar 13, 2021
  8d0b776f
- Merge branch 'PersianKnight/InterfaceSettings' into 'master' · 4022937d
  Samuel Keiffer authored Mar 13, 2021
  4022937d
- Merge branch 'DaforLynx/more-sound-fixes' into 'master' · f18cdfd5
  Samuel Keiffer authored Mar 13, 2021
  f18cdfd5
Mar 12, 2021
- Many small changes to audio code, mainly sfx - changelog in MR · 99261bf1
  DaforLynx authored Mar 12, 2021
  
  99261bf1
- Separated InterfaceSettings from GameplaySettings · dcb32a7f
  PersianKnight authored Mar 12, 2021
  
  dcb32a7f
- Merge branch 'slipped/poise' into 'master' · bb34a604
  Samuel Keiffer authored Mar 12, 2021
  bb34a604
- Fixed broken weapon. · 803e42cc
  Samuel Keiffer authored Mar 12, 2021
  
  803e42cc