Commit Graph

221 Commits (a77f823ba361cde065cd6ed36cdbc8e15fc6b952)

Author SHA1 Message Date
kaetemi a77f823ba3
Fix ucstring merge 3 years ago
kaetemi e508082ce1 Merge commit 'ce5817721a725f74429fad188b8be7acacd7ebb2' into feature/core4-atys 3 years ago
kaetemi 5fe1c8b378
Merge branch 'core4' into feature/core4-atys
# Conflicts:
#	ryzom/common/data_common/msg.xml
#	ryzom/server/src/entities_game_service/client_messages.cpp
#	ryzom/server/src/entities_game_service/player_manager/character.cpp
#	ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp
3 years ago
kaetemi 151f5270bc
Test button for toggling armor (disabled) 4 years ago
kaetemi 41c8499bd4
Sync UI xml with Forge data repo, rev ba4724f848d80775acdd7e3190f6e3eb8af47834 4 years ago
kaetemi a3dea88eb1
Use better contrast 4 years ago
kaetemi b1733439d0
Splash screen for core 4 years ago
kaetemi ec42a95484
Merge branch 'core4' into feature/core4-atys 4 years ago
kaetemi cac99dc9ab
Add missing browser css. Restore login window layout 4 years ago
kaetemi e9080405fc
Update title 4 years ago
kaetemi 5f04f05945
Merge branch 'feature/prepare-cross-merge' into feature/core4-atys 4 years ago
kaetemi 20ed0a4412
Only send position if client game tick advanced as well 4 years ago
kaetemi 4407fc2970
Position speed checks should be based on the client tick. This fixes excessive rubber banding 4 years ago
kaetemi 9d722bb70f
Show correct label for Editor mode in quit dialog, fix kaetemi/ryzomclassic#113 4 years ago
kaetemi 59c1c340b8
Restore some more ui xml formatting 4 years ago
kaetemi 43af8e6695
Restore some more ui xml formatting 4 years ago
kaetemi f128e0807c
Restore some more ui xml formatting 4 years ago
kaetemi 8cecbb4a7d
Restore mailbox and forums 4 years ago
kaetemi deb1c7c131
Remove hardcoded URLs in favour of the web URL provided by the shard 4 years ago
kaetemi fc3f0355a5
Remove web notification polling (remote code execution path) 4 years ago
kaetemi dbe34b0c8f
Merge branch 'develop' into ryzomclassic-develop 4 years ago
kaetemi 6d4b58c281
Update GPL headers 4 years ago
kaetemi fcf97d93df
Merge remote-tracking branch 'ryzomcore/develop' into feature/develop-atys 4 years ago
Nimetu bc0071ac57
Fix issue with single enchant icon on jewels not showing 4 years ago
kaetemi 9d303b2a9a
Preload data in dev client as well, ref kaetemi/ryzomclassic#168 4 years ago
kaetemi 7a647ab76d
Update GPL headers 4 years ago
kaetemi 113f3f97d7
Merge branch 'develop' into ryzomclassic-develop 4 years ago
kaetemi c70ca1f8ab
Update GPL headers 4 years ago
kaetemi 2c167fb360
Don't apply skin color to weapons in info preview, caused by conflicting naming of lead weapon textures, fix ryzomclassic/issues#201 4 years ago
kaetemi 28fd4d9011
Merge branch 'develop' into ryzomclassic-develop 4 years ago
Nimetu 5614028f63 Fix bad merge 4 years ago
Nimetu b2d6c313db Merge branch 'develop' into develop-atys 4 years ago
Nimetu 78fa873003 Merge branch 'atys' into develop-atys 4 years ago
Nimetu 96a03d1cf5 Changed: Preserve icon text case as is 4 years ago
Nimetu a7bc98b0b4 Fix mission give item window sometimes not appearing. 4 years ago
Nimetu cd4914ab94 Cleanup CGroupHTML old properties 4 years ago
Nimetu 36f9888b91 Merge branch 'atys' into develop-atys 4 years ago
Nimetu 17782d5d21 Merge branch 'develop' into develop-atys 4 years ago
Nimetu 2f5b4d7c5b Add custom formatter for regen text 4 years ago
Nimetu 27826eb448 Show bonus/malus timer text if available 4 years ago
Nimetu d210c23b26 Add xml options for icon regen text 4 years ago
Nimetu 04a5aa372b Merge branch 'develop' into develop-atys 4 years ago
Nimetu 65415dfc55 Fixed infinite loop crash from string comparison 4 years ago
Nimetu 29ef76e537 utf-8 fixes, ryzom/ryzomcore#335 4 years ago
Nimetu 040eee5c9e Merge branch 'atys' into develop-atys 4 years ago
Nimetu b70573d1dc Merge branch 'atys' into develop-atys 4 years ago
kaetemi d58854ab33 Merge branch 'develop' into ryzomclassic-develop 4 years ago
kaetemi e998d3a85c Merge remote-tracking branch 'ryzomcore/atys' into feature/develop-atys 4 years ago
kaetemi 5c3b0cf14b Merge remote-tracking branch 'ryzomcore/develop' into feature/develop-atys 4 years ago
Nimetu 779f87d6e7 Change CFile::setRWAccess to only set rw-rw-r-- (+x for directories) on linux/macOS. 4 years ago