Commit graph

3795 commits

Author SHA1 Message Date
kervala
31859175ba Backed out changeset: 79980ce60498 2014-04-24 19:31:53 +02:00
kervala
24fa8df5ff Fusion avec default
--HG--
branch : compatibility
2014-04-24 19:16:42 +02:00
Cédric OCHS
bcc22bb11c Merged in nimetu/ryzomcore/Issue#130 (pull request #65)
Properly restore saved camera distance from config file (issue #130)
2014-04-24 19:14:01 +02:00
kervala
3fff8fe467 Changed: Replaced strlwr by toLower
--HG--
branch : compatibility
2014-04-24 18:11:16 +02:00
Nimetu
7cc1bf9f17 Fix compiling on linux with new OpenGL headers (issue #145)
--HG--
branch : Issue#145
2014-04-23 23:23:23 +03:00
Nimetu
02cb532401 Properly restore saved camera distance from config file (issue #130)
--HG--
branch : Issue#130
2014-04-23 23:20:13 +03:00
dfighter1985
4f39a58e31 Tile Editor crash fixes.
--HG--
branch : gsoc2014-dfighter
2014-04-23 02:10:14 +02:00
dfighter1985
fd5d961ba7 Build fixes.
--HG--
branch : gsoc2014-dfighter
2014-04-23 00:49:17 +02:00
dfighter1985
f882abca07 Merged Georges Editor branch.
--HG--
branch : gsoc2014-dfighter
2014-04-22 21:12:26 +02:00
dfighter1985
4d3a472262 Merged default.
--HG--
branch : branch-tile-edit-ovqt-plugin
2014-04-22 21:10:19 +02:00
dfighter1985
f3b94d38d5 Merged default.
--HG--
branch : branch-features-geqt-plugin
2014-04-22 21:02:34 +02:00
Matthew Lagoe
c7650f041a Merged in shubham_meena/ryzomcore/issue#119 (pull request #63)
removed wrong panel from settings page
2014-04-21 03:31:14 -07:00
botanic
db2f0435cd missing = 2014-04-21 03:03:39 -07:00
botanic
bac99a8815 fix for missing include 2014-04-21 03:00:19 -07:00
botanic
18f72e3781 php is_writable is not reliable 2014-04-21 02:39:29 -07:00
dfighter1985
41f44b2aa6 Merge default.
--HG--
branch : gsoc2012-gui-editor
2014-04-19 21:53:29 +02:00
kervala
ed1a84c99b Changed: Updated OpenGL and OpenGL ES headers
--HG--
branch : compatibility
2014-04-17 10:44:03 +02:00
kervala
831758beb1 Fixed: nglXSwapIntervalEXT return type should be void
--HG--
branch : compatibility
2014-04-17 10:16:30 +02:00
kervala
5a88951837 Changed: Find DirectX libraries in alternative folders
--HG--
branch : compatibility
2014-04-11 17:56:26 +02:00
shubham_meena
1970dd0ff4 remove wrong panel from settings page
--HG--
branch : issue#119
2014-04-11 13:25:12 +05:30
botanic
4891ce5dc4 fix paths 2014-04-07 08:03:55 -07:00
botanic
fd4fce0d6a missing . 2014-04-07 06:39:41 -07:00
botanic
5fe1dd709f display erors on installer 2014-04-07 06:35:15 -07:00
botanic
fff4682d92 missed it on all of them 2014-04-07 06:29:44 -07:00
botanic
cd9deab467 Merge 2014-04-07 06:27:49 -07:00
botanic
08b1602e5a missed a ../ 2014-04-07 06:27:15 -07:00
Matthew Lagoe
0a631f5f9f Merged in shubham_meena/ryzomcore/issue#120 (pull request #60)
changed hardcoded location of ams_lib with location defined in configuration
2014-04-06 22:31:39 -07:00
Matthew Lagoe
3f54b93b30 Merged in shubham_meena/ryzomcore/Issue#123 (pull request #59)
Changed log-in from username to both username and email
2014-04-06 22:29:55 -07:00
kaetemi
e494200c21 Bugfix: Kill users who attempt to escape the game 2014-04-01 13:54:39 +02:00
kaetemi
562dae3c3f Add command to eternally trap players ingame 2014-04-01 13:52:36 +02:00
kaetemi
5ed5cd5ea8 Add interface for HMD with player death support 2014-04-01 13:14:44 +02:00
kervala
8f6c32bd69 Backed out changeset: 3937923211ec
--HG--
branch : compatibility
2014-03-29 12:45:22 +01:00
Jan Boon
2eacddc47c Merged in shubham_meena/ryzomcore/Issue#121 (pull request #58)
Added tile of web in translations
2014-03-28 20:02:14 +01:00
Jan Boon
6765d4f091 Merged in shubham_meena/ryzomcore/issue#127 (pull request #56)
collation changed to utf8_unicode_ci
2014-03-28 20:01:46 +01:00
kaetemi
283f52a03f Merge 2014-03-28 19:50:21 +01:00
kervala
c83afd649d Changed: Replaced some Mac OS X warnings by TODO comments
--HG--
branch : compatibility
2014-03-27 16:36:00 +01:00
kervala
62eb6347e5 Changed: Aligned methods names 2014-03-27 16:34:55 +01:00
kervala
8968124553 Changed: Aligned methods names
--HG--
branch : compatibility
2014-03-27 16:34:55 +01:00
kervala
81881a583f Fixed: Switch not handled warnings
--HG--
branch : compatibility
2014-03-27 15:53:19 +01:00
kervala
9f0daa9a1e Fixed: Wrong header guard warning 2014-03-27 15:51:20 +01:00
kervala
2e6ac0ad84 Fixed: Wrong header guard warning
--HG--
branch : compatibility
2014-03-27 15:51:20 +01:00
kervala
bfaf952f32 Fixed: Warnings with clang: wrong ! and == operators order 2014-03-27 15:50:58 +01:00
kervala
8fa24eeb4e Fixed: Warnings with clang: wrong ! and == operators order
--HG--
branch : compatibility
2014-03-27 15:50:58 +01:00
kervala
b8ad53adf3 Fixed: Typo detected by clang 2014-03-27 13:40:22 +01:00
kervala
79529b1581 Fixed: Typo detected by clang
--HG--
branch : compatibility
2014-03-27 13:40:22 +01:00
kervala
a0801ebffe Changed: Removed useless definitions 2014-03-27 13:39:46 +01:00
kervala
7ab7952dbd Changed: Removed useless definitions
--HG--
branch : compatibility
2014-03-27 13:39:46 +01:00
kervala
def5243d06 Changed: Updated OpenGL headers 2014-03-27 13:39:16 +01:00
kervala
ee87716aa0 Changed: Updated OpenGL headers
--HG--
branch : compatibility
2014-03-27 13:39:16 +01:00
kervala
a8c35f9229 Fixed: Used code being removed by -Wl,-x on Mac OS X 2014-03-27 13:03:38 +01:00
kervala
f62b19eb71 Fixed: Used code being removed by -Wl,-x on Mac OS X
--HG--
branch : compatibility
2014-03-27 13:03:38 +01:00
shubham_meena
685987149d changed hardcoded location of ams_lib with location difined in configuration
--HG--
branch : issue#120
2014-03-27 16:50:26 +05:30
kervala
a77bddf265 Changed: Give priority to ARB extensions in tests
--HG--
branch : compatibility
2014-03-26 14:36:00 +01:00
kervala
55a29115ba Changed: Detect available video memory with OpenGL extensions 2014-03-26 14:34:07 +01:00
kervala
d4fb36d1eb Changed: Detect available video memory with OpenGL extensions
--HG--
branch : compatibility
2014-03-26 14:34:07 +01:00
kervala
0aaad7051b Changed: Use OpenGL ES functions prototypes from official headers 2014-03-26 14:32:00 +01:00
kervala
3e30929867 Changed: Use OpenGL ES functions prototypes from official headers
--HG--
branch : compatibility
2014-03-26 14:32:00 +01:00
kervala
c59f9d8a5e Changed: Optimize OpenGL driver PCH 2014-03-26 14:31:32 +01:00
kervala
406df1c59c Changed: Optimize OpenGL driver PCH
--HG--
branch : compatibility
2014-03-26 14:31:32 +01:00
kervala
927ff14998 Changed: Use OpenGL functions prototypes from official headers
Fixed: glDeleteObjectBufferATI replaced by glFreeObjectBufferATI since 2002
2014-03-26 14:14:36 +01:00
kervala
713c07e1e6 Changed: Use OpenGL functions prototypes from official headers
Fixed: glDeleteObjectBufferATI replaced by glFreeObjectBufferATI since 2002

--HG--
branch : compatibility
2014-03-26 14:14:36 +01:00
kervala
e2797c2567 Changed: Include PCH 2014-03-26 13:14:14 +01:00
kervala
b83c69bf89 Changed: Include PCH
--HG--
branch : compatibility
2014-03-26 13:14:14 +01:00
kervala
e9b8ee0fec Fixed: Improve compilation speed including revision.h in a smaller .cpp file 2014-03-26 13:13:17 +01:00
kervala
868470c19f Fixed: Improve compilation speed including revision.h in a smaller .cpp file
--HG--
branch : compatibility
2014-03-26 13:13:17 +01:00
shubham_meena
420a615321 login.php edited online with Bitbucket: to provide access through both username and email
--HG--
branch : Issue#123
2014-03-25 06:35:21 +00:00
shubham_meena
26c8e7ad15 changed login through email / username
--HG--
branch : Issue#123
2014-03-25 06:29:17 +00:00
botanic
6c345bf6b7 Merge 2014-03-24 10:45:54 -07:00
botanic
99b122c84c fix my typo's 2014-03-24 10:45:42 -07:00
shubham_meena
af2cf14273 changed login from username to both username and email
--HG--
branch : Issue#123
2014-03-24 17:07:53 +05:30
kervala
16d0f49b45 Changed: Minor changes 2014-03-23 20:36:46 +01:00
kervala
3045bdac62 Changed: Removed pwd command 2014-03-23 20:36:05 +01:00
kervala
3f2b2757d1 Fixed: Removed chmod because useless 2014-03-23 20:34:28 +01:00
kervala
d40db9f2af Fixed: Wrong parameters passed to bash script 2014-03-23 20:32:44 +01:00
kervala
4c159a04dd Changed: Use BuildName only on Unix 2014-03-23 20:31:59 +01:00
kervala
697e72751e Changed: Use fullpath in batch file 2014-03-23 20:27:09 +01:00
kervala
41ac5d56d8 Changed: Create .sh file under Unix 2014-03-23 20:26:29 +01:00
kervala
350c6ec5d7 Changed: Renamed RZ_PATCH to RZ_USE_PATCH 2014-03-23 20:25:48 +01:00
shubham_meena
5bef18032e added web title in translations
--HG--
branch : Issue#121
2014-03-23 18:48:39 +05:30
shubham_meena
7217a99c59 added title of web in translations
--HG--
branch : Issue#121
2014-03-23 17:56:42 +05:30
shubham_meena
bfb2b0c595 libsetup.php edited online with Bitbucket
--HG--
branch : issue#127
2014-03-23 10:45:30 +00:00
shubham_meena
f6f0f42d1f colation changed to utf8_unicode_ci
--HG--
branch : issue#127
2014-03-23 15:16:20 +05:30
kervala
7932937df9 Changed: Don't patch "main_exedll" and "main_cfg" categories under Unix 2014-03-22 19:36:53 +01:00
kervala
aa9c18481d Changed: Use "BuildName" from client_default.cfg to determinate last supported patch version by current client under Unix 2014-03-22 19:36:13 +01:00
kervala
98f33cfa87 Changed: Use RZ_USE_SEVENZIP instead of NL_USE_SEVENZIP 2014-03-22 18:20:30 +01:00
kervala
2076a6b13d Changed: Typo 2014-03-22 16:23:28 +01:00
kervala
6c4d33c2a6 Changed: Improvements in patch system 2014-03-22 16:23:17 +01:00
kaetemi
2f19b88539 Fix crash in 0_setup.py on Linux 2014-03-15 09:12:40 +01:00
kaetemi
de9724a821 Add color to console output 2014-03-13 18:34:26 +01:00
kaetemi
b3cf16f263 Separate output directories from input directories 2014-03-12 19:19:52 +01:00
botanic
9661711c66 dont chmod just check permissions 2014-03-10 12:56:47 -07:00
kaetemi
c5f3c5d9d0 Compile fix 2014-03-02 21:43:24 +01:00
kaetemi
5a97a3aef0 Fix config 2014-03-02 01:37:20 +01:00
kaetemi
98fdfb672c Cleanup config 2014-03-02 01:27:09 +01:00
kaetemi
2b5373e436 Fix duplicate config data 2014-03-02 01:13:48 +01:00
Cédric OCHS
c5e40670d9 Merged in StudioEtrange/ryzomcore/cmake-fixes (pull request #55)
Cmake fix - FindWindowsSDK
2014-02-28 10:19:37 +01:00
botanic
d5d65ae56e fixed cretion of users 2014-02-25 19:38:10 -08:00
kaetemi
dd97d5d41b Remove duplicate cfg data 2014-02-21 20:39:24 +01:00
StudioEtrange
994c47dc92 fix find windows.h for winsdk8
--HG--
branch : cmake-fixes
2014-02-21 17:35:15 +01:00
StudioEtrange
646b8fc9ae Fix bug cannot find right include folder for winsdk8
--HG--
branch : cmake-fixes
2014-02-21 16:40:04 +01:00
Jan Boon
fc835cbe6c Merged in StudioEtrange/ryzomcore/ovqt-fixes (pull request #54)
OVQT Plugins - CMake Install fixes
2014-02-21 04:53:06 +01:00
kaetemi
1764cfd708 Fix #138 Pointer truncation in AI Script VM 2014-02-21 03:17:54 +01:00
kaetemi
91d453dd63 Make packed sheets behaviour consistent accross services 2014-02-20 21:53:11 +01:00
kaetemi
020bfb775e Disable build of dataset packed sheets in build pipeline 2014-02-20 20:15:18 +01:00
kaetemi
86f86c6170 Add additional executable permissions 2014-02-20 19:42:56 +01:00
kaetemi
72fac9aaf1 Update default directories 2014-02-20 03:37:23 +01:00
kaetemi
151e86bc9d Add example configuration for patchman 2014-02-20 03:35:36 +01:00
kaetemi
d08c53aaf7 Remove unnecessary cfg 2014-02-20 03:13:30 +01:00
kaetemi
934f5c3f0b Add script for creating a new shard patch 2014-02-20 03:09:31 +01:00
kaetemi
27da0870b2 Rename scripts 2014-02-20 01:31:09 +01:00
kaetemi
e8770db674 Nicer batch scripts for pipeline 2014-02-20 01:06:29 +01:00
kaetemi
b52230832e Add build process script for shard sheets 2014-02-19 23:51:55 +01:00
kaetemi
2289285c14 Add AIS sheets to shard sheets packer tool 2014-02-19 00:40:04 +01:00
kaetemi
2555e93771 Add sheets packer tool for CTimeDateSeasonManager 2014-02-19 00:07:22 +01:00
kaetemi
30030220c1 Add EGS sheets to shard sheets packer tool 2014-02-18 23:50:55 +01:00
kaetemi
f65a48cc4b Rename CSheets in GPM to CGpmSheets 2014-02-18 22:43:06 +01:00
kaetemi
32eafb179d Add sheets packer tool for shard GPMS and CContinentContainer 2014-02-18 22:37:21 +01:00
kaetemi
accafc4192 Add sheets packer tool for shard MS and IOS 2014-02-18 22:19:56 +01:00
kaetemi
a6a72fd622 Fix #134 Exit crash after failed response from character selection 2014-02-17 13:57:26 +01:00
kaetemi
5c17bb1f8e Make IG load waiting loop more agreeable 2014-02-17 01:54:12 +01:00
kaetemi
76ce7523ff Additional streaming behaviour fix for XAudio2 driver 2014-02-17 00:20:29 +01:00
kaetemi
5ec390b0d6 Fix #132 You can no longer walk through rezzed players 2014-02-16 23:09:19 +01:00
kaetemi
49fa568123 Remove some debug 2014-02-16 20:44:58 +01:00
kaetemi
d680b70308 Fix some streaming behaviour in XAudio2 driver 2014-02-16 20:36:58 +01:00
StudioEtrange
0b8db2399c CMAKE TARGET : SHARED and MODULE
About Shared Library (shared) and Module Library (module) type of cmake target
INSTALL command has different behaviour for ARCHIVE LIBRARY RUNTIME depending on the platform
2014-02-16 19:43:44 +01:00
botanic
e741f31a64 Merge 2014-02-15 19:56:43 -08:00
botanic
a96f651742 force deleting of file so it works even after server crash 2014-02-15 19:52:08 -08:00
kaetemi
be311fb0f8 Fix for excessive inlining of npc chat serialization, issue #97
--HG--
branch : compatibility
2014-02-14 18:36:15 +01:00
kervala
8adf6df76a Changed: Minor changes
--HG--
branch : compatibility
2014-03-23 20:36:46 +01:00
kervala
a62393a9ed Changed: Removed pwd command
--HG--
branch : compatibility
2014-03-23 20:36:05 +01:00
kervala
f4233222e5 Fixed: Removed chmod because useless
--HG--
branch : compatibility
2014-03-23 20:34:28 +01:00
kervala
c9651b257d Fixed: Wrong parameters passed to bash script
--HG--
branch : compatibility
2014-03-23 20:32:44 +01:00
kervala
39eb83eb87 Changed: Use BuildName only on Unix
--HG--
branch : compatibility
2014-03-23 20:31:59 +01:00
kervala
058aa23813 Changed: Use official settings for client.cfg
--HG--
branch : compatibility
2014-03-23 20:27:55 +01:00
kervala
edf3f49afd Changed: Use fullpath in batch file
--HG--
branch : compatibility
2014-03-23 20:27:09 +01:00
kervala
dfb187126a Changed: Create .sh file under Unix
--HG--
branch : compatibility
2014-03-23 20:26:29 +01:00
kervala
91a3e128cc Changed: Renamed RZ_PATCH to RZ_USE_PATCH
--HG--
branch : compatibility
2014-03-23 20:25:48 +01:00
kervala
769a5ca2ee Changed: Don't patch "main_exedll" and "main_cfg" categories under Unix
--HG--
branch : compatibility
2014-03-22 19:36:53 +01:00
kervala
2c396827d5 Changed: Use "BuildName" from client_default.cfg to determinate last supported patch version by current client under Unix
--HG--
branch : compatibility
2014-03-22 19:36:13 +01:00
kervala
607f39561d Changed: Use RZ_USE_SEVENZIP instead of NL_USE_SEVENZIP
--HG--
branch : compatibility
2014-03-22 18:20:30 +01:00
kaetemi
cd1107adf5 Fix #134 Exit crash after failed response from character selection
--HG--
branch : compatibility
2014-02-17 13:57:26 +01:00
kaetemi
d2d87d2644 Make IG load waiting loop more agreeable
--HG--
branch : compatibility
2014-02-17 01:54:12 +01:00
kaetemi
6426393210 Additional streaming behaviour fix for XAudio2 driver
--HG--
branch : compatibility
2014-02-17 00:20:29 +01:00
kaetemi
4d3d7a000a Fix #132 You can no longer walk through rezzed players
--HG--
branch : compatibility
2014-02-16 23:09:19 +01:00
kaetemi
f703359eaa Remove some debug
--HG--
branch : compatibility
2014-02-16 20:44:58 +01:00
kaetemi
17b99ba796 Fix some streaming behaviour in XAudio2 driver
--HG--
branch : compatibility
2014-02-16 20:36:58 +01:00
kervala
c26e4c7426 Changed: Typo
--HG--
branch : compatibility
2014-03-22 16:23:28 +01:00
kervala
20ce763f35 Changed: Improvements in patch system
--HG--
branch : compatibility
2014-03-22 16:23:17 +01:00
kaetemi
cb6661b10d Fix for excessive inlining of npc chat serialization, issue #97 2014-02-14 18:36:15 +01:00
kaetemi
1bafddccf6 Fixup paths (could we use the search paths for this?) 2014-02-14 04:52:11 +01:00