Commit Graph

235 Commits (adf97190761fcdedb5a81713f4031ce5744bb65c)

Author SHA1 Message Date
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
Nimetu 3f3991816b Fix missing css length type 3 years ago
Nimetu e0d54f7897 Draw table background/border using css renderers 3 years ago
Nimetu 37eec8cd7f Dotted/dashed border styles 3 years ago
Nimetu 2046c4bf6e Draw browser background with CSSBackgroundRenderer 3 years ago
Nimetu 12c515c264 Parse background style into own class 3 years ago
Nimetu 285cfb163f Fix possible deadlock in css content attribute 3 years ago
Nimetu a40ddf7955 Methods to preallocate texture id and swap texture for existing id 3 years ago
Nimetu dff191a7c2 Move loading texture from file/memory into own functions 3 years ago
Nimetu f26dc534c8 Split CDataDownload into subclasses 3 years ago
Nimetu dfe45029ab Add CSSLength, CSSBackground, CSSBackgroundRenderer classes 3 years ago
Nimetu 65edd9f95d Draw double/groove/ridge border styles 3 years ago
Nimetu 487f9f060e Fix css rule declaration splitting 3 years ago
Nimetu 2e816ddf6e Add "transparent" to html color list 3 years ago
Nimetu 5d4a04169b Update getCssLength for new types, enable reading negative values. 3 years ago
Nimetu b2ec03d1a1 Fix background shorthand for -position and -clip 3 years ago
Nimetu 234465387b Fix getCssLength returning false for '0' 3 years ago
Nimetu 63f1fb73dd Fix table background color and image draw order 3 years ago
Nimetu 565932c18d Expand css margin shorthand 3 years ago
Nimetu cade609a3a Fix textarea not preserving linebreaks, keep tab char 3 years ago
Nimetu 95716b65ca Fix comparing x twice in Direct3d setupScissor 4 years ago
kaetemi 2fc5798f67
Revert "Adjust default ports from 49xxx range to 43xxx range"
This reverts commit 0a1689ae10.
4 years ago
kaetemi ec42a95484
Merge branch 'core4' into feature/core4-atys 4 years ago
kaetemi 0a1689ae10
Adjust default ports from 49xxx range to 43xxx range 4 years ago
kaetemi 5f04f05945
Merge branch 'feature/prepare-cross-merge' into feature/core4-atys 4 years ago
kaetemi 7d1661df42
Merge branch 'develop' into feature/develop-atys 4 years ago
kaetemi 7873a839ef
Change to GroupController 4 years ago
kaetemi 3352401f24
Version bump 4 years ago
kaetemi cb9094f091
Merge branch 'develop' into ryzomclassic-develop 4 years ago
kaetemi 0c5f4cdc1a
Implement NLNET sleepUntilDataAvailable for Win32 build 4 years ago
kaetemi 2cd2b9502f
Sender doesn't guarantee anything about pos, this doesn't seem to work on Win32 host 4 years ago
kaetemi feb7e7a812
Merge branch 'develop' into ryzomclassic-develop 4 years ago
kaetemi 8a7e96f7a6
Fix crash with bad `parts[next]` index 4 years ago
kaetemi 8b6c3276e4
Defer browsing while web server not set 4 years ago
kaetemi deb1c7c131
Remove hardcoded URLs in favour of the web URL provided by the shard 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
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 bb03f80d84
Remove dead code, ref kaetemi/ryzomclassic#93 4 years ago
kaetemi c6f8baa058
Use streaming vertex buffer for animating regular skinned meshes, writing to a read locked and shared vertex buffer is illegal, fix kaetemi/ryzomclassic#93 4 years ago
kaetemi 85ec6e618e
Fix build on vs2008 4 years ago
kaetemi 1aba4c13cb
Reduce audio log when switching between looping and streaming source 4 years ago
kaetemi 28fd4d9011
Merge branch 'develop' into ryzomclassic-develop 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 3b91146d23 Changed: Allow to use 2x/4x hi-res texture atlas for GUI elements 4 years ago
Nimetu 474802810b Fixed throw(type) deprecated in C++11 warning 4 years ago