Commit Graph

537 Commits (0007051a194f54d0ffff98502d2056abcd593258)

Author SHA1 Message Date
kaetemi c41cdd76ff
Add script for extracting list of sheets required for R2 pallete. Add script for parsing and generating sitem names 3 years ago
kaetemi ec63cdc818
Fix world editor paths 3 years ago
kaetemi d235885d70
Fix truncated string conversion 3 years ago
kaetemi ef4fb03143
Update executable paths in tools 3 years ago
kaetemi cf2bf5629f
Move item rename to be an admin command, not for player use 3 years ago
kaetemi e0082cb919
Fix tool build 3 years ago
kaetemi 3e1ef7845c
Fix typo 3 years ago
kaetemi c12f83d36d
Merge fixes from core 3 years ago
kaetemi 97c7f85aed
Merge r2 entry points changes 3 years ago
kaetemi 6169126391
Fix includes 3 years ago
kaetemi ec6b13a88b
Fix duplicate include 3 years ago
kaetemi 553a51488b
Fix include 3 years ago
kaetemi 0cf92bc6a8
Fix include 3 years ago
kaetemi b9e71480f4
Merge fixes from core branch 3 years ago
kaetemi 2889e81d63
Typo 3 years ago
kaetemi e62991d40c
Restore character cpp formatting 3 years ago
kaetemi 41e4f6800f
Merge fixes from core branch 3 years ago
kaetemi 678d888b5c
Merge stuff from atys branch 3 years ago
kaetemi 6a79a5bf0f
Include fixes from atys branch 3 years ago
kaetemi 2928e81ec7
Merge fixes from core branch 3 years ago
kaetemi b4638c7969
Include fixes from atys branch 3 years ago
kaetemi 0b449bb95a
Regenerate sources 3 years ago
kaetemi ecf990f8ae
Sync network xml with Forge data repo, rev ba4724f848d80775acdd7e3190f6e3eb8af47834 3 years ago
kaetemi 41c8499bd4
Sync UI xml with Forge data repo, rev ba4724f848d80775acdd7e3190f6e3eb8af47834 3 years ago
kaetemi a3dea88eb1
Use better contrast 3 years ago
kaetemi b1733439d0
Splash screen for core 3 years ago
kaetemi 7cba0c8794
Merge branch 'core4' into feature/core4-atys 3 years ago
kaetemi 23b188cadc
Support launch ctrl on dev shard 3 years ago
kaetemi 4fb55a86d3
Add launch priority to dev shard configuration 3 years ago
kaetemi 9cf4677005
Generate AES configuration for dev shard 3 years ago
kaetemi 2fc5798f67
Revert "Adjust default ports from 49xxx range to 43xxx range"
This reverts commit 0a1689ae10.
3 years ago
kaetemi 4fe7175916
Revert "Adjust SU port"
This reverts commit 77e69856d4.
3 years ago
kaetemi ec42a95484
Merge branch 'core4' into feature/core4-atys 3 years ago
kaetemi 7709977b48
Put the proper version number in service titles 3 years ago
kaetemi 77e69856d4
Adjust SU port 3 years ago
kaetemi b6e79ee3e1
More useful defaults for generated batch 3 years ago
kaetemi 0a1689ae10
Adjust default ports from 49xxx range to 43xxx range 3 years ago
kaetemi 5a8fa2052b
Generate shard configuration for service dashboard 3 years ago
kaetemi 10fc562e07
Add trick for reusable dev config 3 years ago
kaetemi 614da137ac
Remove a lost file 3 years ago
kaetemi 1d06892f16
Remove duplicate web folder 3 years ago
kaetemi 08c094e957
Remove exe 3 years ago
kaetemi 681f133400
Remove redundant cfg files 3 years ago
kaetemi cac99dc9ab
Add missing browser css. Restore login window layout 3 years ago
kaetemi e9080405fc
Update title 3 years ago
kaetemi 5f04f05945
Merge branch 'feature/prepare-cross-merge' into feature/core4-atys 3 years ago
kaetemi e6a617b8bc
Sync with Forge server repo, rev ee7e32c71e8b4988e07eb6c52fec6a3fffe0cfc3 3 years ago
Nuno c8ba121b88
Merge branch 'ark' 3 years ago
Nuno 438cce1323
Merge branch 'ark' 3 years ago
Nuno 005f1c755c
Merge branch 'ark' 3 years ago
Nuno 4108367413
Merge branch 'ark' 3 years ago
Nuno 3ccdb43683
Player can't exchanges jewels with allegories 3 years ago
Nuno aad1a6edd0
Merge branch 'ark' 3 years ago
Nuno 9b475fde60
Merge branch 'outpost_refactoring' 3 years ago
Nuno 4401db3dc7
Merge branch 'feature/bonusmalus-timers' 3 years ago
Nuno ca543ce9b6
Merge branch 'outpost_refactoring' 3 years ago
Nuno 73fc8e09ef
Merge branch 'outpost_refactoring' 3 years ago
Nuno c2fa3133b9
Merge branch 'outpost_refactoring' 3 years ago
Nuno 796582e235
Merge branch 'new_features' 3 years ago
Nuno 1c57ac7b8f
Merge branch 'ark' 3 years ago
Nuno 0f74f62640
Merge branch 'ark' 3 years ago
Nuno d5c03115d9
Remove useless variable 3 years ago
Nuno fe9b7aea89
Remove bad commit 3 years ago
Nuno c4fc834e67
Updated shard.screen.rc 3 years ago
Nuno 729deabd7a
Update install rocketchat 3 years ago
Nuno 0479a5ba8e
Merge branch 'allegories' 3 years ago
Nuno c4115ae2a4
Updated tools 3 years ago
Nuno 46ad8bcf5d
Merge branch 'new_features' 3 years ago
Nuno af4f4a1de6
Merge branch 'fixes' 3 years ago
Nuno c0129de5ed
Fixes for getNPCNameFromAlias 3 years ago
Nuno 5761a4a638
Merge remote-tracking branch 'origin/fixes' 3 years ago
Nuno 8d180bd38b
Merge branch 'ark' 3 years ago
Nuno bad68017b8
Fix issue with getTargetNames who are lowerized 3 years ago
Nuno e0c4bcf4e0
Merge branch 'new_features' 3 years ago
Nuno a1d3f91a9b
Merge branch 'new_features' 3 years ago
Nuno 2804161714
Merge branch 'new_features' 3 years ago
Nuno 371f529699
Fix 3 years ago
Nuno 4d4223c87c
Fix 3 years ago
Nuno f7953eea36
Fix 3 years ago
Nuno 806cb449a1
Some fixes 3 years ago
Nuno b76ac3d37f
Merge branch 'fixes' 3 years ago
Nuno d33f6b283f
Merge branch 'deepl' 3 years ago
Nuno 08393ea94d
Merge branch 'marauder_fame' 3 years ago
Nuno 9b5a4d94cf
Merge branch 'new_features' 3 years ago
Nuno ca042995c0
Merge branch 'fixes' 3 years ago
Nuno d88b549dbc
Merge branch 'fixes' 3 years ago
Nuno e3b030b823
Merge branch 'ark' 3 years ago
Nuno bf4ccacec6
Merge branch 'ark' 3 years ago
Nuno f0cc3f3b42
Merge branch 'ark' 3 years ago
Nuno 4008a69448
Added setAnimalTitle 3 years ago
kaetemi 141e7c6459
Sync to Forge server repo, rev 9f74b215ab99c508b08e2cee125946167d87e2ba 3 years ago
Nuno 000fdfb5d7
Merge branch 'fixes' 3 years ago
Nuno 17d84c5925
Merge branch 'fixes' 3 years ago
Nuno 0e833c37ef
Merge branch 'fixes' 3 years ago
Nuno 7f33e9bdd6
Merge branch 'fixes' 3 years ago
Nuno 5678ef1727
Revert "Merge branch 'yubo'"
This reverts commit 5319587e80ed7e822944565cde8b9a437b8fc55c.
3 years ago
Nuno 619b5fd122
Merge branch 'yubo' 3 years ago
Nuno a58af169ab
Merge branch 'ark' 3 years ago
Nuno bd6c6c4fc2
Merge branch 'deepl' 3 years ago
Ulukyn d6dcd13938
Merge branch 'fixes' 3 years ago
Ulukyn 72d29ef8f6
Merge branch 'fixes' 3 years ago
Ulukyn 578ae687df
Merge branch 'ark' 3 years ago
Ulukyn 3c178cb506
Merge branch 'deepl' 3 years ago
Ulukyn 0d57aad8b9
Merge branch 'fixes' 3 years ago
Ulukyn e6bb1f2f54
Merge branch 'deepl' 3 years ago
Ulukyn ea095ca4f3
Merge branch 'fixes' 3 years ago
Ulukyn 8df98ce44a
Merge branch 'ark' 3 years ago
Ulukyn ae685b3d68
Merge branch 'ark' 3 years ago
Ulukyn 653a8fb472
Added: login htacess and server_open_status 3 years ago
Ulukyn 5bddc6eaa7
Added: python tools for server commands
Install Rocketchat script
3 years ago
Ulukyn 406072f3e1
Merge branch 'ark' 3 years ago
Ulukyn 1c8a939797
Merge branch 'ark' 3 years ago
Ulukyn 463738c036
Changed: remove some logs 3 years ago
Ulukyn 10666c23bd
Merge branch 'ark' 3 years ago
Ulukyn 085cead1a1
Merge branch 'ark' 3 years ago
Ulukyn f764a0e6d9
Merge branch 'ark' 3 years ago
Ulukyn 4dafe289e5
Merge branch 'ark' 3 years ago
Ulukyn a3818593b8
Merge remote-tracking branch 'origin/feature-new-forage-sbricks' 3 years ago
Ulukyn 1b5f2ed003
Merge branch 'ark' 3 years ago
Ulukyn ecf38c8ddc
Merge branch 'ark' 3 years ago
Ulukyn be3c81aa80
Merge branch 'generic-gameplay' 3 years ago
Ulukyn 887dbdad0d
Merge branch 'ark' 3 years ago
Ulukyn 62457be418
Fixed: typo 3 years ago
Ulukyn f3b22802e8
Fixed: Don't manage translation of Npcs with deepl 3 years ago
Ulukyn 230ca5ffdb
Fixed: Remove hardcoding of mongo server and db. Prevent crash of ios 3 years ago
Ulukyn 1a6b197411
Merge branch 'generic-gameplay' 3 years ago
Ulukyn d3b2e1f4b5
Changed: updated database_plr file 3 years ago
Ulukyn 164719aa55
Fixed: Remove useless include of news_types.h 3 years ago
Ulukyn ed4e88c773
Fixed: replace nlassert by return to prevent crash of EGS 3 years ago
Ulukyn b35ba142be
Merge branch 'ark' 3 years ago
Nuno Gonçalves 417b42487d
Merge with Ark 3 years ago
Nuno Gonçalves dad6e43285
Merge with Ark 3 years ago
Nuno Gonçalves 16d3fa8e6a
Fixed: Prevent crash of IOS when renames uses ' and special chars 3 years ago
kaetemi cca82baa89
Include other stuff from Forge server repo, same rev 3 years ago
kaetemi a3a074f455
Sync with Forge server, rev fa044821f36dfdd47986c32a1357fc028984b385 3 years ago
kaetemi 3b993c6cda
Update defaults 3 years ago
kaetemi 5b22e0950a
Disable adjustment warning since it's not very useful. Speed limit needs to be able to reference a more accurate timing 3 years ago
kaetemi 20ed0a4412
Only send position if client game tick advanced as well 3 years ago
kaetemi c8ecf0a756
Enable full frequency connection 3 years ago
kaetemi d07e219439
Cleanup unused FS tick value 3 years ago
kaetemi 92bfb0aafb
Re-add lag compensation time from client to tick value in mirror 3 years ago
kaetemi 4407fc2970
Position speed checks should be based on the client tick. This fixes excessive rubber banding 3 years ago
kaetemi 3f63f27143
Disable slow system metrics function because it really is slow and chokes the update loop 3 years ago
kaetemi 30117e92be
More hashing of sequential indices 3 years ago
kaetemi 77f92c72a9
Fix race conditions in frontend service send task 3 years ago
kaetemi b33ff3cb93
Remove useless CPU hog 3 years ago
kaetemi da9c5173a6
Improve debug message 3 years ago
kaetemi 3ec5a87d40
Generate script to launch tabbed 3 years ago
kaetemi 88e2ebd31c
Todo note 3 years ago
kaetemi 492865deed
Skip AES placeholder 3 years ago