Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,927 Commits 151 Branches 18 Tags 2.1 GiB
9e5c0ce601
Commit Graph

3927 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Shipsey
9e5c0ce601 Merge branch 'silentium/arms-and-armor' into 'master' 
Added 2 sets of armour.

See merge request veloren/veloren!951
 2020-05-17 19:03:00 +00:00
Silentium
1673a25e8b Added 2 sets of armour. 2020-05-17 19:02:59 +00:00
Justin Shipsey
bb85dab281 Merge branch 'treeco/build-mode-fixes' into 'master' 
Swapped block placement and destruction buttons

See merge request veloren/veloren!995
 2020-05-16 23:48:25 +00:00
Monty Marz
6c4e3eb00a Merge branch 'pfau/0.6-bg' into 'master' 
Pfau/0.6 bg

See merge request veloren/veloren!996
 2020-05-16 12:48:30 +00:00
Monty Marz
ecb7963730 Pfau/0.6 bg 2020-05-16 12:48:29 +00:00
Marcel
9693fd33ae Merge branch 'xMAC94x/release-numbers' into 'master' 
xmac94x/release numbers

See merge request veloren/veloren!999
 2020-05-15 23:33:35 +00:00
Marcel Märtens
4876dd492d fix Changelog.md links 2020-05-16 01:18:50 +02:00
Marcel Märtens
39de4bd4fd swap main background for 0.6 background 2020-05-16 01:07:07 +02:00
Marcel Märtens
ec03c4518a Change the version number to 0.6 2020-05-16 00:50:40 +02:00
Imbris
307cbaddb3 Merge branch 'imbris/stats-updater' into 'master' 
Update stats in a separate thread

See merge request veloren/veloren!997
 2020-05-15 21:52:40 +00:00
Imbris
6b70354fbb Wrap updates in transaction 2020-05-15 16:40:06 -04:00
Imbris
49e2fb80e7 Update stats in a separate thread 2020-05-15 16:03:51 -04:00
Joshua Barretto
db59a3ca3d Merge branch 'small-fixes' into 'master' 
Dungeon Bosses

See merge request veloren/veloren!994
 2020-05-15 19:07:11 +00:00
Joshua Barretto
fff4021777 Better spawn town 2020-05-15 19:26:09 +01:00
Joshua Barretto
ba80f7c872 Fixed square staircases in dungeons 2020-05-15 18:34:05 +01:00
Joshua Barretto
51a4d5c402 Fixed incorrect giant names 2020-05-15 18:33:34 +01:00
Treeco
a338ed3f24 Swapped block placement and destruction buttons 
Also capped placement range to match destruction range
 2020-05-15 17:39:44 +01:00
Joshua Barretto
93de58252e More interesting dungeon features 2020-05-15 17:22:51 +01:00
Joshua Barretto
fb0c817528 More powerful bosses 2020-05-15 16:32:09 +01:00
Joshua Barretto
aac28d04d5 Added dungeon bosses, boss loot, boss arenas 2020-05-15 16:05:50 +01:00
Songtronix
c3e1fd8664 Merge branch 'mockersf/fix-doc-generation' into 'master' 
fix doc generation

See merge request veloren/veloren!993
 2020-05-15 14:18:15 +00:00
Imbris
71dd520cd6 Merge branch 'shandley/fix-spawn-levels' into 'master' 
Fix spawn level bug

See merge request veloren/veloren!987
 2020-05-15 04:13:29 +00:00
Shane Handley
a41576e767 Correctly set the exp target for the next level when spawning a character. 
Removed the unwrap_or from the update method for stats persistence, and
have a dedicated method for updating single rows with a new connection.
 2020-05-15 13:27:26 +10:00
Mckol
cbfe3d52fc Merge branch 'Mckol/552-fix-persistence-crash' into 'master' 
Fix #552

Closes #552

See merge request veloren/veloren!984
 2020-05-15 00:45:41 +00:00
Mckol
fe859fc2e1 VELOREN_SAVES_DIR envar now overrides the server persistence db path 2020-05-15 01:54:14 +02:00
Mckol
48c5d37a5d Make singleplayer use voxygen's config path for persistence path. 2020-05-15 01:54:13 +02:00
Imbris
649075c89a Merge branch 'imbris/small-fix' into 'master' 
Show main menu even if there are no stats

See merge request veloren/veloren!990
 2020-05-14 23:47:34 +00:00
Imbris
eac11ecfe8 Show main menu even if there are no stats 2020-05-14 19:10:27 -04:00
Mckol
aa69046055 Changed the default path of persistence database 
Now the default is `./saves/`, it's also configurable.
 2020-05-14 22:42:44 +02:00
François Mockers
c757645587 fix links 2020-05-14 22:13:20 +02:00
François Mockers
ae712f77a2 fix iterator type 2020-05-14 22:13:08 +02:00
Monty Marz
fdd8303fe4 Merge branch 'CapsizeGlimmer/waypoint_notification' into 'master' 
Popup message when setting waypoint

See merge request veloren/veloren!973
 2020-05-14 16:56:10 +00:00
CapsizeGlimmer
0a723614f9 Popup message when setting waypoint 2020-05-14 16:56:10 +00:00
Joshua Barretto
51eb928eb8 Merge branch 'small-fixes' into 'master' 
Small fixes for 0.6

See merge request veloren/veloren!986
 2020-05-13 16:01:52 +00:00
Forest Anderson
1179aa2586 Merge branch 'angelonfira/clean-changelog' into 'master' 
Fix spelling and structure of changelog

See merge request veloren/veloren!977
 2020-05-13 15:04:49 +00:00
Joshua Barretto
dd91fc53f8 Resolved bizarre dungeon spawn rate bug 2020-05-13 15:49:33 +01:00
Forest
b678796549 Fix spelling and structure of changelog 2020-05-13 09:58:42 -04:00
Forest Anderson
acab072a63 Merge branch 'shandley/persistence-stats' into 'master' 
Stats Persistence

See merge request veloren/veloren!970
 2020-05-13 13:43:22 +00:00
Shane Handley
fa8c6418f6 Write stats to the DB when a player disconnects from the server. 2020-05-13 22:08:26 +10:00
Forest Anderson
7703bc1214 Merge branch 'imbris/entity_count' into 'master' 
Fill in entity_count in metrics

See merge request veloren/veloren!983
 2020-05-13 08:13:05 +00:00
Acrimon
d47706fe4c Merge branch 'acrimon/derive-uuid-fix' into 'master' 
Fix #556

Closes #556

See merge request veloren/veloren!982
 2020-05-13 00:03:21 +00:00
Imbris
8f857e6e11 Fill in entity_count in metrics 2020-05-12 19:44:27 -04:00
Shane Handley
e852e0cfab - Update the stats of characters individually, reverting the change with 
big combined updates.
- Add a timer to the stats persistence system and change the frequency
that it runs to 10s
- Seperate the loading of character data for the character list during
selection, and the full data we will grab during state creation. Ideally
additional persisted bits can get returned at the same point and added
to the ecs within the same block.
 2020-05-13 09:14:09 +10:00
Shane Handley
0a6f9b860d Gather all characters stats in the system, build one big query, rather than per-character queries. 2020-05-13 09:14:08 +10:00
Shane Handley
7c6c9f4302 Stats persistence 
- Update client code to use persisted stats
- Add a system for stats persistence
- Add a basic scheduler to control duration between execution of
persistence systems
 2020-05-13 09:14:08 +10:00
Shane Handley
e5853dbdd4 Initial models, migration and client code for stats persistence. 2020-05-13 09:14:08 +10:00
Acrimon
0993e9e146
Fix #556 2020-05-13 01:08:33 +02:00
Justin Shipsey
19a0ffb673 Merge branch 'slipped/animtweaks' into 'master' 
Slipped/animtweaks

See merge request veloren/veloren!980
 2020-05-12 02:42:26 +00:00
jshipsey
ceb771bb2c keep mobs from exploding whenever they're hit 2020-05-11 21:44:21 -04:00
jshipsey
ef70949d5d cyclops 2020-05-11 21:44:21 -04:00