Commit Graph

10882 Commits (56d9c5fd0432865944c18bd5151936e559b20a46)
 

Author SHA1 Message Date
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
kaetemi e7717bd38c Git diff doesn't seem to like the imported $Id$ keyword contents to be on the repo 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
kaetemi 0d1ac00392
Merge branch 'core4' into feature/core4-atys 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 e3c5606baf Better fix 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 0063396369 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
kaetemi 415fe11606
Also apply u16 idx fix to msg.xml 3 years ago
kaetemi 56345cc0fc
Merge branch 'core4' into feature/core4-atys 3 years ago
Nuno ccef75cdf3
Merge branch 'fixes' 3 years ago
Nuno 92186cf142
Merge branch 'fixes' 3 years ago
kaetemi eddf3aaeeb
Merge branch 'merge/2021-11-19' into feature/core4-atys 3 years ago
Ulukyn 103cf6c580
Adding serve Shard 3 years ago
Nuno 9fab5a2020
Merge branch 'outpost_refactoring' into main/atys-live 3 years ago
Nuno 8ba8fc9f60
Merge branch 'new_features' into main/atys-live 3 years ago
Nuno 890eea4aad
Merge branch 'fixes' into main/atys-live 3 years ago
Nuno Gonçalves (Ulukyn) 5141435cdf
Update values from Atys 3 years ago
Nuno Gonçalves (Ulukyn) a7477d52b1
Fix 3 years ago
Nuno Gonçalves (Ulukyn) 0007051a19
Update cfgs templates 3 years ago
Nuno Gonçalves (Ulukyn) 05555015ea
Fixed: set uint16 in resell slotID 3 years ago