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,931 Commits 151 Branches 18 Tags
Commit Graph

3931 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Forest Anderson
2c3c3d6162 Merge branch 'angel/update-readme-banner' into 'master' 
Updated the readme banner

See merge request veloren/veloren!1007
 2020-05-19 15:21:42 +00:00
Forest Anderson
4896443aba Changed to new image 2020-05-19 09:31:10 -04:00
Forest Anderson
6ec101ecc2 Merge branch 'jbeich/veloren-freebsd' into 'master' 
Enable system assets on more Unices

See merge request veloren/veloren!1005
 2020-05-19 00:20:07 +00:00
Jan Beich
b3fa399a82 Enable system assets on more Unices 2020-05-18 15:53:50 +00:00
Justin Shipsey
462461fc0a 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
ee9b137d5f Added 2 sets of armour. 2020-05-17 19:02:59 +00:00
Justin Shipsey
944bae8d5c 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
cb44425e9d 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
7a362810ee Pfau/0.6 bg 2020-05-16 12:48:29 +00:00
Marcel
67a993d638 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
49c7e6568d fix Changelog.md links 2020-05-16 01:18:50 +02:00
Marcel Märtens
c55ec95bb7 swap main background for 0.6 background 2020-05-16 01:07:07 +02:00
Marcel Märtens
5e96162ad4 Change the version number to 0.6 2020-05-16 00:50:40 +02:00
Imbris
cb86ca4317 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
353a97accf Wrap updates in transaction 2020-05-15 16:40:06 -04:00
Imbris
1059f20049 Update stats in a separate thread 2020-05-15 16:03:51 -04:00
Joshua Barretto
3b8dae468a Merge branch 'small-fixes' into 'master' 
Dungeon Bosses

See merge request veloren/veloren!994
 2020-05-15 19:07:11 +00:00
Joshua Barretto
db1065c478 Better spawn town 2020-05-15 19:26:09 +01:00
Joshua Barretto
42e7f99414 Fixed square staircases in dungeons 2020-05-15 18:34:05 +01:00
Joshua Barretto
072bac639f Fixed incorrect giant names 2020-05-15 18:33:34 +01:00
Treeco
355d9d9a57 Swapped block placement and destruction buttons 
Also capped placement range to match destruction range
 2020-05-15 17:39:44 +01:00
Joshua Barretto
5f560d9183 More interesting dungeon features 2020-05-15 17:22:51 +01:00
Joshua Barretto
02647aa8ee More powerful bosses 2020-05-15 16:32:09 +01:00
Joshua Barretto
1f99350448 Added dungeon bosses, boss loot, boss arenas 2020-05-15 16:05:50 +01:00
Songtronix
5c8aefc51b 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
a33f331234 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
3fe0159ab0 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
7895072aa0 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
a407558669 VELOREN_SAVES_DIR envar now overrides the server persistence db path 2020-05-15 01:54:14 +02:00
Mckol
e73e9354d2 Make singleplayer use voxygen's config path for persistence path. 2020-05-15 01:54:13 +02:00
Imbris
d0a4d1ff73 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
7bd65d9e3a Show main menu even if there are no stats 2020-05-14 19:10:27 -04:00
Mckol
19498758e1 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
58133d66b1 fix links 2020-05-14 22:13:20 +02:00
François Mockers
ba0d9d3037 fix iterator type 2020-05-14 22:13:08 +02:00
Monty Marz
b249467311 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
bb0881253d Popup message when setting waypoint 2020-05-14 16:56:10 +00:00
Joshua Barretto
1caec46663 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
3a07609e8b 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
4d40c938ee Resolved bizarre dungeon spawn rate bug 2020-05-13 15:49:33 +01:00
Forest
7f8fac440f Fix spelling and structure of changelog 2020-05-13 09:58:42 -04:00
Forest Anderson
5ea3f19d18 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
71b66350d2 Write stats to the DB when a player disconnects from the server. 2020-05-13 22:08:26 +10:00
Forest Anderson
a6fb1bd37f 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
ec6500d7a6 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
d587708958 Fill in entity_count in metrics 2020-05-12 19:44:27 -04:00
Shane Handley
d988b34c22 - 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
e2072ddae0 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
ceb3e26341 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
622465b35d Initial models, migration and client code for stats persistence. 2020-05-13 09:14:08 +10:00