Commit Graph

9972 Commits (b6b67f748271ceb49333afbfae748a77c67d38f9)
 

Author SHA1 Message Date
Nuno 1eb651a946 Merge branch 'master' into silan_refactoring 3 years ago
Nuno 7da7d8cbbe Merge branch 'interface_textures' into yubo 3 years ago
Nuno 0ee26a6488 Merge branch 'master' into interface_textures 3 years ago
Nuno 9e404a5965 Merge branch 'deco_objects' into yubo 3 years ago
Nuno 97099768dc Merge branch 'master' into deco_objects 3 years ago
kaetemi 7d1661df42
Merge branch 'develop' into feature/develop-atys 3 years ago
kaetemi 19a0d929bb
Exclude commits from attribution 3 years ago
Nuno a443848924 Merge branch 'rewards' into yubo 3 years ago
Nuno ca0dc24aa0 Merge branch 'rewards' 3 years ago
Nuno 6d68e96dd4 Merge branch 'master' into rewards 3 years ago
kaetemi 0c5f4cdc1a
Implement NLNET sleepUntilDataAvailable for Win32 build 3 years ago
kaetemi 8a7e96f7a6
Fix crash with bad `parts[next]` index 3 years ago
kaetemi a227dccbb8
Fix PHP setup script 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 c5658cfe26
Merge remote-tracking branch 'ryzomcore/merge-into-atys' into feature/develop-atys 4 years ago
Nimetu bc0071ac57
Fix issue with single enchant icon on jewels not showing 4 years ago
kaetemi 37a729b5cc
Merge remote-tracking branch 'ryzomcore/atys' into feature/develop-atys
# Conflicts:
#	code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
4 years ago
Nuno Gonçalves (Ulukyn) efc1883cca Move files to root 4 years ago
Nuno 83a021e1e6 Merge branch 'master' into translations 4 years ago
kaetemi 9d303b2a9a
Preload data in dev client as well, ref kaetemi/ryzomclassic#168 4 years ago
Nuno 58b5941bbe
Flag to use preset folders 4 years ago
Nuno 431b1ea339 Merge branch 'atys' into atys-live 4 years ago
kaetemi c70ca1f8ab
Update GPL headers 4 years ago
Nuno 6c3d6403b0 Merge branch 'atys' into merge-into-atys 4 years ago
Nuno 405974c9c0 Merge remote-tracking branch 'origin/fixes' into atys 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 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 b9bdabd1f0
Add missing path to georges config 4 years ago
kaetemi d4a3a5bc06
Weld vertices 4 years ago
kaetemi cdc2cacfc0
Fixup shape2obj 4 years ago
kaetemi c5ed59638e
Add missing lookup entries to object viewer config 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 56d747fa02
Merge remote-tracking branch 'ryzomcore/develop' into develop 4 years ago
Nuno cc5bd3ddae Merge branch 'interface_textures' into yubo 4 years ago
Nuno 5613eb855e Remove useless visual_slot.tab 4 years ago
Nimetu 5614028f63 Fix bad merge 4 years ago
Nimetu a28bda89e6 Fix issue with single enchant icon on jewels not showing 4 years ago
Nimetu b2d6c313db Merge branch 'develop' into develop-atys 4 years ago
Nuno 74c643f147 Merge branch 'ark' into yubo 4 years ago
Nuno 3d43c3c626 Merge branch 'ark' 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 52e0e71c4a Simple html/css test tool 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
Nuno 6bd853f7bf Merge branch 'master' into ark 4 years ago
Nuno 49b4295765 Merge remote-tracking branch 'origin/fixes' into atys 4 years ago