Commit Graph

221 Commits (main/yubo-dev)

Author SHA1 Message Date
Nuno 9e3e56b50b Merge remote-tracking branch 'origin/53-setting-to-change-tooltip-opacity' into main/yubo-dev 3 years ago
Nuno 224c14cfef Merge remote-tracking branch 'origin/fix-media-player-playlist-limit' into main/yubo-dev 3 years ago
nimetu 80e556ca8a Limit media playlist using list maxelements property 3 years ago
bensaine 1c65914b10 fix: tooltip opacity 3 years ago
bensaine ddb4cce712 initial draft 3 years ago
Nuno 9fc091f99b Add macro checks for enable code for old gcc version (< 40800) 3 years ago
Nuno 7129a8fa5f Add macro checks for enable code for old gcc version (< 40800) 3 years ago
Nuno ab4aa7487c Revert "Merge branch 'server/yubo-dev' into main/yubo-dev"
This reverts commit a4d92c34bd.
3 years ago
Nuno 96fe140ded Merge branch 'server/gingo-test' into server/yubo-dev 3 years ago
Nuno 858cf091aa Merge branch 'main/gingo-test' into server/gingo-test 3 years ago
Nuno db86219eab Added NL_NO_ASSERT to remove asserts in server 3 years ago
Nuno aeb1dc1737 Fix issues with old gcc compiler (required by forge server) 3 years ago
Nuno b1bc1a3b6c Fix issues with old gcc compiler (required by forge server) 3 years ago
Nuno 703c21cbc5 Merge branch 'feature/core4-atys' into main/yubo-dev 3 years ago
Ben Saine 82b724fe88 Resolve "Encoding issues in client beta (after core4 merge)" 3 years ago
Nimetu 7c82f26bac Fix CViewText always returning localization key 3 years ago
Nimetu 7344c98e6e Add macOS to azure pipeline 3 years ago
Nimetu b325126b20 Fixed cleanup of html downloads 3 years ago
Nuno e5f449bded Merge branch '27-fixed-crash-with-html-image-downloads' into main/yubo-dev 3 years ago
Nimetu 8517bb72e1 Fixed cleanup of html downloads 3 years ago
Nuno 85c80ab0f2 Smooth the z displacement of entities 3 years ago
Nuno 8ea4ff53cb Added stairs collisions 3 years ago
kaetemi 0c999cb58a
Merge remote-tracking branch 'origin/feature/develop-atys' into feature/core4-atys 3 years ago
kaetemi adff33fec5
Merge branch 'core4' into feature/core4-atys 3 years ago
Nimetu 13eef096b4 Merge branch 'develop' into develop-atys 3 years ago
kaetemi 8f839dc9c7 Properly follow StartupVerify setting 3 years ago
kaetemi 5fcaafbc60 Show more useful error on login failure 3 years ago
kaetemi 3d208e024d Improve c++0x check 3 years ago
Nimetu 759ece01d0 Merge branch 'atys' into develop-atys 3 years ago
Nuno 0d68ca05e2 Revert xml_macros 3 years ago
Nuno 0fbbf10361 Merge branch 'fixes' into atys 3 years ago
Nuno d7d1bc60c2 Changes from Core 3 years ago
Nuno 3709ea4520 Revert All core changes (to be reapplied on next commit) 3 years ago
Ulu Kyn 92ff9f12b0 Move to root 3 years ago
kaetemi 7127f9f5f4
Properly follow StartupVerify setting 3 years ago
kaetemi 939836b5bb
Show more useful error on login failure 3 years ago
kaetemi bdbd12c625
Improve c++0x check 3 years ago
kaetemi de7b301af9
Improve c++0x check 3 years ago
kaetemi cee0f53c1d
Merge remote-tracking branch 'ryzomcore/develop' into core4 3 years ago
Nimetu 78478e32cd Merge branch 'develop' into develop-atys 3 years ago
Nimetu ea6e4d91c3 Html special chars for title/textarea tags should remain decoded 3 years ago
Nimetu d388ff78ec Merge branch 'develop' into develop-atys 3 years ago
Nimetu 0b503e352b Fix htmlEscape function from deadlocking 3 years ago
Nimetu d9dd9863b7 Merge branch 'develop' into develop-atys 3 years ago
kaetemi 1b162fb3ae
Merge remote-tracking branch 'ryzomcore/develop' into core4 3 years ago
Nimetu 9ecda65791 Fix table td background color inheriting from row 3 years ago
kaetemi 1c035401c6
Merge remote-tracking branch 'ryzomcore/develop' into core4 3 years ago
Nimetu 028f6cdd3e Add -ryzom-modulate-text-color to separate text from background, ryzom/ryzomcore#644 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 ac9e8f4f5e
Merge remote-tracking branch 'origin/develop' into core4
# Conflicts:
#	ryzom/client/src/interface_v3/action_handler_help.cpp
3 years ago