Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity
4063 commits 14 branches 1 tag 255 MiB
Commit graph

3907 commits

Author SHA1 Message Date
kaetemi
43a061bebd SSE2: Compile fix 
--HG--
branch : sse2
 2014-06-20 03:08:51 +02:00
dfighter1985
1ce333bb00 As Object Viewer no longer uses the QtOpenGL widget this is not needed. 
--HG--
branch : gsoc2014-dfighter
 2014-06-19 18:40:50 +02:00
dfighter1985
bb7fa7987b More widgets can use the color picker now. 
--HG--
branch : gsoc2014-dfighter
 2014-06-19 17:21:11 +02:00
dfighter1985
f1ff5e7d2c Added color picking support to the GUI Editor. TODO: change all the widget definitions. 
--HG--
branch : gsoc2014-dfighter
 2014-06-18 16:48:33 +02:00
dfighter1985
0a26a5a1c6 Why did I make these public in the first place? 
--HG--
branch : gsoc2014-dfighter
 2014-06-18 02:53:39 +02:00
dfighter1985
d64b499284 Making master Dnk happy. 
--HG--
branch : gsoc2014-dfighter
 2014-06-18 02:51:53 +02:00
dfighter1985
3d48a01170 Wrong slash... 
--HG--
branch : gsoc2014-dfighter
 2014-06-18 02:41:58 +02:00
dfighter1985
a80053083d Crashfix: If the status info widget isn't removed it miraclously crashes the app on shutdown. TODO: investigate why. 
--HG--
branch : gsoc2014-dfighter
 2014-06-18 01:20:37 +02:00
dfighter1985
4341ac3139 Unload plugins when killing them. 
--HG--
branch : gsoc2014-dfighter
 2014-06-18 01:15:39 +02:00
dfighter1985
ca78ce10a0 Object Viewer plugin will now use the Nel3DWidget in the Core plugin. 
--HG--
branch : gsoc2014-dfighter
 2014-06-16 16:22:52 +02:00
dfighter1985
d74d1d1663 Had to move the Nel3DWidget library to the core plugin, because Nel can only be used statically at this point. Which makes using the separate Nel3DWidget library inparctical. 
--HG--
branch : gsoc2014-dfighter
 2014-06-16 15:30:35 +02:00
dfighter1985
b4eac44a9d Moved the Nel 3d widget into it's own library. 
--HG--
branch : gsoc2014-dfighter
 2014-06-15 22:22:01 +02:00
dfighter1985
dde63ceb31 Nel3DWidget is no longer in the GUI Editor namespace. 
--HG--
branch : gsoc2014-dfighter
 2014-06-15 19:52:04 +02:00
dfighter1985
81908eea01 Set some windows attributes. 
--HG--
branch : gsoc2014-dfighter
 2014-06-15 19:42:41 +02:00
dfighter1985
e5921ffd64 Activate the driver when getting a show event, and clear the GUI Editor display widget when there's no GUI loaded. 
--HG--
branch : gsoc2014-dfighter
 2014-06-15 19:28:57 +02:00
dfighter1985
f8505429ee Moved the event listener from the 3d widget to the gui control class. 
--HG--
branch : gsoc2014-dfighter
 2014-06-15 19:16:52 +02:00
dfighter1985
3cbe37d700 Fixed build error that was caused by two widgets having the same filenames. 
--HG--
branch : gsoc2014-dfighter
 2014-06-15 18:41:54 +02:00
dfighter1985
59b4735d96 Renamed nelgui_widget.* to nelgui_ctrl.* 
--HG--
branch : gsoc2014-dfighter
 2014-06-14 19:37:42 +02:00
dfighter1985
676587559b Renamed NelGUIWidget to NelGUICtrl, and changed it's base class from QWidget to QObject. 
--HG--
branch : gsoc2014-dfighter
 2014-06-14 18:44:57 +02:00
dfighter1985
1457469dfe TimerId should be set to 0 when hiding. 
--HG--
branch : gsoc2014-dfighter
 2014-06-14 18:32:27 +02:00
dfighter1985
9d9cd463b0 GUI Editor main window will now send the show/hide events to NelGUIWidget. 
--HG--
branch : gsoc2014-dfighter
 2014-06-14 18:31:50 +02:00
dfighter1985
c692b168d7 Split Nel3DWidget and NelGUIWidget. 
--HG--
branch : gsoc2014-dfighter
 2014-06-14 17:28:33 +02:00
kaetemi
cec2970169 SSE2: Replace prefetch 
--HG--
branch : sse2
 2014-06-14 01:09:05 +02:00
kaetemi
6734852fa3 SSE2: Ensure correct allocator is used 
--HG--
branch : sse2
 2014-06-14 00:38:35 +02:00
kaetemi
71a598db7e SSE2: Remove dead code 
--HG--
branch : sse2
 2014-06-13 22:21:07 +02:00
kaetemi
848932f93a SSE2: Fix for MinGW 
--HG--
branch : sse2
 2014-06-19 00:05:43 +02:00
kaetemi
ac3e69b8ab Merge with default 
--HG--
branch : sse2
 2014-06-20 03:01:32 +02:00
kaetemi
93e97c56cd Implement occlusion queries for AMD/ATI in the OpenGL driver 2014-06-19 21:49:33 +02:00
kaetemi
66922f04bd Fix Ryzom server compile under MinGW 2014-06-19 20:43:03 +02:00
kaetemi
fd6a95e3a3 Backed out changeset: f665fcc42968 (except dru.cpp) 2014-06-19 20:22:12 +02:00
kaetemi
b18203fc4e Fix Ryzom server compile under MinGW 2014-06-19 20:19:39 +02:00
kaetemi
2e096a9b36 Fix Ryzom client compile under MinGW 2014-06-19 01:17:35 +02:00
kaetemi
7adf98e8a7 Fix NeL GUI compile under MinGW 2014-06-19 00:40:29 +02:00
kaetemi
cffd68230c Fix XA2 driver compile under MinGW 2014-06-18 23:18:06 +02:00
kaetemi
401d4bc791 Fix NeL Tools compile under MinGW 2014-06-18 21:05:39 +02:00
kaetemi
43be0fd2a5 Fix D3D driver compile under MinGW 2014-06-18 16:29:02 +02:00
kaetemi
40854aa5f3 Fix NeLNS compile under MinGW 2014-06-18 13:03:11 +02:00
kaetemi
75f7b9f931 Fix Snowballs service compile under MinGW 2014-06-18 12:52:03 +02:00
kaetemi
ee4a9ef334 Fix NeL Samples for MinGW 2014-06-18 12:40:53 +02:00
kaetemi
9838ef56de Fix Snowballs compile under MinGW 2014-06-18 02:05:54 +02:00
kaetemi
f4fd8bb669 Fix linking of OpenGL driver under MinGW 2014-06-18 01:21:05 +02:00
kaetemi
2f3f12e034 Fix linking of OpenAL driver under MinGW 2014-06-18 00:28:08 +02:00
kaetemi
5bd6c5e06b Fix compilation of NL3D under MinGW 2014-06-17 22:33:56 +02:00
kaetemi
1df9bec563 Fix compilation of NLNET under MinGW 2014-06-17 21:56:53 +02:00
kaetemi
3dd11fe157 Fix compilation of NLMISC under MinGW 2014-06-17 21:48:25 +02:00
kaetemi
f6ad306a57 SSE2: Add macro for force inline 
--HG--
branch : sse2
 2014-06-13 20:25:45 +02:00
kaetemi
d3fb390cf3 SSE2: Align CMatrix 
--HG--
branch : sse2
 2014-06-13 19:33:09 +02:00
kaetemi
556a41afee SSE2: Implement alignment for arena allocator 
--HG--
branch : sse2
 2014-06-13 19:26:22 +02:00
kaetemi
eee9ba0cae SSE2: Add aligned allocators 
--HG--
branch : sse2
 2014-06-13 19:12:31 +02:00
kaetemi
4ed37ac68e SSE2: Add CMake options 
--HG--
branch : sse2
 2014-06-13 19:00:24 +02:00
dfighter1985
fe7c3e4edf Rename log menu item. 
--HG--
branch : gsoc2014-dfighter
 2014-06-09 18:01:14 +02:00
dfighter1985
92cb5eea3a Updated qrc location. 
--HG--
branch : gsoc2014-dfighter
 2014-06-09 17:58:07 +02:00
dfighter1985
a86605f8d8 Move the log trigger menu item into it's own menu, and remove the menu when unloading the plugin. 
--HG--
branch : gsoc2014-dfighter
 2014-06-09 17:55:45 +02:00
dfighter1985
d4ee31ed63 Destroy context when unloading plugins. 
--HG--
branch : gsoc2014-dfighter
 2014-06-09 17:40:06 +02:00
dfighter1985
f060adbed7 Plugin loading, with issues.. 
--HG--
branch : gsoc2014-dfighter
 2014-06-09 01:14:13 +02:00
dfighter1985
c45b6a17f4 Don't crash when removing the plugin of the first tab. 
--HG--
branch : gsoc2014-dfighter
 2014-06-08 21:56:31 +02:00
dfighter1985
0096ad1204 Remove Object Viewer menus when unloading the plugin. 
--HG--
branch : gsoc2014-dfighter
 2014-06-08 19:39:58 +02:00
dfighter1985
9ad71881dc Line endings... 
--HG--
branch : gsoc2014-dfighter
 2014-06-08 19:28:19 +02:00
dfighter1985
b9bbe802d4 Remove display sheet id action when unloading the plugin. 
--HG--
branch : gsoc2014-dfighter
 2014-06-08 19:27:03 +02:00
dfighter1985
3fc289e7fa Remove sheet builder action when unloading the plugin. 
--HG--
branch : gsoc2014-dfighter
 2014-06-08 18:56:40 +02:00
dfighter1985
828f31a2a4 Remove translation manager menu when unloading the plugin. 
--HG--
branch : gsoc2014-dfighter
 2014-06-08 18:45:13 +02:00
dfighter1985
fb4dc15fe7 Remove GUI Editor menu when unloading the plugin. 
--HG--
branch : gsoc2014-dfighter
 2014-06-08 18:30:09 +02:00
dfighter1985
d7536332a6 Implemented plugin unload. 
--HG--
branch : gsoc2014-dfighter
 2014-06-08 18:17:24 +02:00
dfighter1985
eb41278369 GUI for plugin loading / unloading in the plugin dialog. 
--HG--
branch : gsoc2014-dfighter
 2014-06-07 21:07:46 +02:00
dfighter1985
732b24b985 Updated qrc location. 
--HG--
branch : gsoc2014-dfighter
 2014-06-07 20:04:15 +02:00
dfighter1985
c2a951fd6c Progressbar should look nicer on the splash screen now. 
--HG--
branch : gsoc2014-dfighter
 2014-06-07 18:10:43 +02:00
dfighter1985
f0a312a6e5 Progress bar will now actually show progress. 
--HG--
branch : gsoc2014-dfighter
 2014-06-07 17:23:06 +02:00
dfighter1985
f177a49a9e Instead of drawing the progressbar on the splash image, draw it below it. Also move the status text closer to the progress bar. 
--HG--
branch : gsoc2014-dfighter
 2014-06-07 16:56:10 +02:00
dfighter1985
2ce11cc2f9 Line endings... 
--HG--
branch : gsoc2014-dfighter
 2014-06-07 16:41:39 +02:00
kaetemi
15dc492690 Set additional preferred memory 2014-06-05 15:51:25 +02:00
kaetemi
ad0bf64b18 Cleanup extension initialization 2014-06-05 15:03:09 +02:00
dfighter1985
91463f9fa2 The splash screen will now inform the user about what's happening. 
--HG--
branch : gsoc2014-dfighter
 2014-06-05 01:57:13 +02:00
dfighter1985
cfa12b6d81 Somehow I always forget the banners... 
--HG--
branch : gsoc2014-dfighter
 2014-06-04 22:30:32 +02:00
dfighter1985
c15eebaadf First iteration of the new splash screen. 
--HG--
branch : gsoc2014-dfighter
 2014-06-04 22:09:11 +02:00
kaetemi
766cace955 Implement volatile vertex buffer for opengl driver, should provide considerable performance improvements for particle systems. Needs additional testing. 2014-06-04 18:59:54 +02:00
dfighter1985
1d23a092c1 rename. 
--HG--
branch : gsoc2014-dfighter
 2014-05-26 21:07:39 +02:00
dfighter1985
883c0d4462 Settings dialog on first startup. 
--HG--
branch : gsoc2014-dfighter
 2014-05-26 21:04:05 +02:00
dfighter1985
1306853697 More renames. 
--HG--
branch : gsoc2014-dfighter
 2014-05-25 22:45:34 +02:00
kaetemi
0d67c420cd Set exec mode 2014-05-23 22:39:50 +02:00
kaetemi
1f786418a7 Crash safely with an error when sphrase is missing on client 2014-05-23 19:13:36 +02:00
kaetemi
47e5e587ad Use vector instead of map to store sbrick sheets, it's faster 2014-05-23 19:13:08 +02:00
kaetemi
4311da091f Add --admininstall parameter to c1_shard_patch 2014-05-23 17:25:52 +02:00
dfighter1985
4adbb6dbd9 Moved plugin menu items to their own sub-menu into the menubar. 
--HG--
branch : gsoc2014-dfighter
 2014-05-23 02:26:31 +02:00
kaetemi
0a41e6b3c4 Fix Windows compilation of lightmap_optimizer 2014-05-23 01:57:19 +02:00
dfighter1985
79348c8e93 More renames. 
--HG--
branch : gsoc2014-dfighter
 2014-05-22 15:56:38 +02:00
dfighter1985
ef7a39641f Rename. 
--HG--
branch : gsoc2014-dfighter
 2014-05-22 15:06:40 +02:00
dfighter1985
eeb4e48d38 Renames. 
--HG--
branch : gsoc2014-dfighter
 2014-05-19 02:08:03 +02:00
dfighter1985
0974142bcc Renamed the plugin XML files. 
--HG--
branch : gsoc2014-dfighter
 2014-05-19 01:45:19 +02:00
dfighter1985
3440c7081b Renamed ovqt and ovqt plugin binaries. 
--HG--
branch : gsoc2014-dfighter
 2014-05-18 21:47:31 +02:00
liria
94b30c76fa Merged default into lightmap_optimizer_port_to_linux 
--HG--
branch : lightmap_optimizer_port_to_linux
 2014-05-15 16:36:59 +02:00
dfighter1985
12890373a4 Merged default 
--HG--
branch : gsoc2014-dfighter
 2014-05-14 18:01:15 +02:00
kervala
46e5c39e74 Changed: Replaced some spaces by tabulations 2014-05-13 09:29:45 +02:00
botanic
b57755b9ee Fix for bug from de6f606 2014-05-10 09:15:00 -07:00
kervala
d7c9608d83 Fixed: Compilation error 2014-05-09 19:18:56 +02:00
dfighter1985
e6569049e9 Same as before... 
--HG--
branch : gsoc2014-dfighter
 2014-05-07 00:53:07 +02:00
dfighter1985
3c72598645 Readding core plugin that was missing because of a hgignore entry. 
--HG--
branch : gsoc2014-dfighter
 2014-05-07 00:50:57 +02:00
dfighter1985
91f859bc8a Moved ovqt to /code/studio 
--HG--
branch : gsoc2014-dfighter
 2014-05-06 01:30:28 +02:00
kaetemi
db5c65fedf Merge 2014-04-30 12:57:54 +02:00
kaetemi
1a4a7bafab Backed out changeset: 897087f1fa71, 7c3f1f0dc9d8, 61d11f94e3ea 2014-04-30 12:54:20 +02:00
kaetemi
798d207d0d Fix EOL 2014-04-30 12:53:06 +02:00
kervala
060347f2b9 Changed: Small typo 2014-04-30 09:18:31 +02:00
kervala
50324ccd55 Fixed #151: White box on character selection screen (a big thanks to nimetu for the patch!) 2014-04-29 10:31:02 +02:00
kervala
8972ecf1b3 Fixed: tmpFlagRemovedPatchCategories not needed anymore because RemovedPatchCategories defined in login_patch.cpp 2014-04-26 22:51:03 +02:00
sfb
c666176278 Modified the CTestConfig to point at the new CI server. 2014-04-25 14:00:46 -05:00
kervala
01bc4eeb92 Changed: Minor changes 2014-04-25 11:58:35 +02:00
kervala
e84dd7b5f7 Changed: Replaced strlwr by toLower 2014-04-24 22:59:29 +02:00
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
liria
d89e6c9c2c Merged default into lightmap_optimizer_port_to_linux 
--HG--
branch : lightmap_optimizer_port_to_linux
 2014-04-11 16:47:50 +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
liria
12f63f3a6e Typo correction 
--HG--
branch : lightmap_optimizer_port_to_linux
 2014-04-05 13:49:14 +00:00
liria
30036d000c Merged default into lightmap_optimizer_port_to_linux 
--HG--
branch : lightmap_optimizer_port_to_linux
 2014-04-05 15:40:17 +02: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