Commit Graph

10016 Commits (30612d4897a80d73139b22a2bf9c553c25b5a6e3)
 

Author SHA1 Message Date
Nuno 30612d4897 Merge branch 'fix-area-effect-flying-text' into main/yubo-dev 3 years ago
Nuno 83be3cf90c Merge remote-tracking branch 'origin/26-encoding-issues-in-client-beta-after-core4-merge' into main/yubo-dev 3 years ago
Nimetu fc65536a1d Fix utf8 encoding on sphrase info window 3 years ago
Nuno d25f2222b7 Merge remote-tracking branch 'origin/modify-item-buff-icons' into main/yubo-dev 3 years ago
Nimetu 26827d2c66 Fix item buff icon overlapping with quantity 3 years ago
Nuno 9a578ad02e Merge branch '25-remove-lock-option-from-item-menu-in-guild-inventory' into main/yubo-dev 3 years ago
Nuno c86a3df2cf Fix 3 years ago
Nuno 06c9adcdcc Merge branch '25-remove-lock-option-from-item-menu-in-guild-inventory' into main/yubo-dev 3 years ago
Nuno Gonçalves (Ulukyn) b6781af51e Merge branch 'inventory-fixes' into 'main/gingo-test'
Inventory fixes

See merge request ryzom/ryzom-core!12
3 years ago
Nuno Gonçalves (Ulukyn) e1b611f219 Inventory fixes 3 years ago
Nuno Gonçalves (Ulukyn) 8d7932a271 Merge branch 'self-kill' into 'main/gingo-test'
Merge selfkill

See merge request ryzom/ryzom-core!13
3 years ago
Nuno Gonçalves (Ulukyn) 0cc7a35dad Merge selfkill 3 years ago
Nuno a1816724d0 Merge branch 'feature/colissions-stairs' into main/yubo-dev 3 years ago
Nuno 85c80ab0f2 Smooth the z displacement of entities 3 years ago
Nuno f0b74071ad Npcs and mobs climb in stairs too 3 years ago
Nuno 8ea4ff53cb Added stairs collisions 3 years ago
Nuno 47183549b2 Merge branch 'main/gingo-test' into main/yubo-dev 3 years ago
Nuno 2304445c39 Remove bad commit (core4 path will be used in a next merge) 3 years ago
Ulu Kyn 7f39d5d799 Merge ryzom-data into ryzom-core 3 years ago
Ulu Kyn 701d7309e5 Revert "Merge ryzom-data into ryzom-core"
This reverts commit f3d0c9dc5b.
3 years ago
Ulu Kyn f3d0c9dc5b Merge ryzom-data into ryzom-core 3 years ago
Ulu Kyn a71f022c1a Merge ryzom-data into ryzom-core 3 years ago
Nuno cc3d42737e Merge branch 'fixes' into main/gingo-test 3 years ago
Nuno 1e590f1a69 Remove CPath::memoryCompress() because break CPath::lockup() 3 years ago
Nuno 2088ca6923 Merge remote-tracking branch 'origin/16-drag-drop-to-player-trade-window-from-all-inventories' into main/yubo-dev 3 years ago
Nuno f450b57be0 Merge branch '6-resolve-show-lock-status-of-items-in-room-and-guild' into main/yubo-dev 3 years ago
Nuno fbb343ad51 Added resal_flag to databases 3 years ago
bensaine e1527b724b fix: typo 3 years ago
bensaine c3a633ae50 add: srcInvIndex 3 years ago
Nuno a76e8e1a64 Merge branch 'fixes' into main/gingo-test 3 years ago
Nuno aeea387d2a Merge branch 'fixes' into main/yubo-dev 3 years ago
Nuno 2df441225c Add RYZOM_PRODUCT_VERSION 3 years ago
Nuno 1197e19835 Merge branch 'main/gingo-test' into main/yubo-dev 3 years ago
Nuno 56cbc51005 Merge branch 'fixes' into main/gingo-test 3 years ago
Nuno 7ce53abffe Missing serialization (client can't load the icfg) 3 years ago
Nuno 4c4028822e Missing serialization (client can't load the icfg) 3 years ago
Nuno b4323b6515 Missing serialization (client can't load the icfg) 3 years ago
Nuno 9923062417 Merge branch 'main/gingo-test' into fixes 3 years ago
Nuno 8f74ba7851 Merge branch 'feature/develop-atys' into main/gingo-test 3 years ago
Nimetu 146a7e25e6 Fix flying text for area magic/combat actions 3 years ago
Nuno f878fd2a0b Merge branch 'add-screenshot-dir-to-config' into main/yubo-dev 3 years ago
Nimetu 7f7a11967b Add ScreenShotDirectory entry to client.cfg 3 years ago
Nuno d6f367b2ba Merge remote-tracking branch 'origin/2-rework-player-trade-window' into main/yubo-dev 3 years ago
Nuno 3f5c3c5d98 Merge remote-tracking branch 'origin/2-rework-player-trade-window' into main/yubo-dev 3 years ago
Nuno f95b51c934 Merge branch 'feature/develop-atys' into main/yubo-dev 3 years ago
Nuno 514f4613a8 Remove CPath::memoryCompress() because break CPath::lockup() 3 years ago
Ulu Kyn f6fc869602 Merge branch 'self-kill' into main/yubo-dev 3 years ago
Ulu Kyn 810976f843 Merge branch 'main/gingo-test' into self-kill 3 years ago
Nuno 07c9562799 Merge branch 'inventory-fixes' into main/yubo-dev 3 years ago
Ulu Kyn 4c9b16350c Merge branch 'main/gingo-test' into inventory-fixes 3 years ago