kaetemi
1a5f3a2875
ryzomcore/v0.11.1
2014-11-24 14:57:36 +01:00
kaetemi
9fba7eff72
Fix bug causing patch painter fail to open more than once
2014-11-19 16:30:14 +01:00
kaetemi
2e94bc1d15
Fix bug causing patch painter fail to open more than once
2014-11-19 16:30:14 +01:00
kaetemi
fb44ccb82d
Remove PIC library
2014-11-19 16:20:14 +01:00
kaetemi
6d6926a8b8
ryzomcore/v0.11.0
2014-11-10 23:34:41 +01:00
dfighter1985
b6c9cc5498
CDBViewQuantity shouldn't crash in the editor.
2014-10-20 22:49:46 +02:00
dfighter1985
38d2366a71
it's not a bad idea to store the value in the right variable...
2014-10-20 22:21:59 +02:00
dfighter1985
112d137add
DBViewNumber shouldn't crash anymore.
2014-10-20 20:57:08 +02:00
dfighter1985
3193ab11de
When setting the Id of the decorated edit box, set the Id of the text as well.
2014-10-20 18:51:53 +02:00
Jan Boon
841f06be25
Merged in nimetu/ryzomcore/html-table-rendering (pull request #92 )
...
Some improvements to table rendering
2014-10-18 04:44:34 +02:00
Nimetu
754a0ff04d
Fix html img not showing on some cases, clean up addImage method
2014-10-18 01:20:56 +03:00
Nimetu
a24400c059
Fix crash when using textarea without form
2014-10-18 00:15:51 +03:00
dfighter1985
c96c030b25
set the Id of the text properly when loading the decorated edit box.
2014-10-17 22:25:30 +02:00
dfighter1985
68fa126867
Create the viewtext of the decorated edit box when the box is created, also adjust it so the text is drawn to the right of the left texture.
2014-10-17 21:18:26 +02:00
dfighter1985
25b5750239
Fixed a typo that messed up the textures of decorated editbox.
2014-10-17 16:01:50 +02:00
dfighter1985
2a07542bf2
Save decorated edit box as such.
2014-10-16 21:03:58 +02:00
dfighter1985
50625d3e29
Update decorated edit box decoration coords while dragging.
2014-10-16 20:58:47 +02:00
dfighter1985
9b8991038d
Allow selection of CGroupEditBox.
2014-10-16 20:29:36 +02:00
dfighter1985
715fdd1ddf
Implemented CGroupEditBoxDecor a decorated CGroupEditBox.
2014-10-16 20:25:19 +02:00
dfighter1985
03c6a69141
Fix parent pos and size parsing.
2014-10-15 19:46:43 +02:00
Nimetu
11442b15ae
Change table defaults valign=middle, cellpadding=1, cellspacing=2
2014-10-15 00:02:38 +03:00
Nimetu
66ca072948
Render table with rowspan, colspan.
...
Borders, if enabled, adds +1 to cell padding.
2014-10-14 15:29:06 +03:00
Nimetu
23d51172c2
Add rowspan and colspan attributes
2014-10-14 15:26:14 +03:00
dfighter1985
284de64589
When creating a new GUI set the base color to white.
2014-10-13 17:47:42 +02:00
dfighter1985
b8d16d8b9b
Pos and Size parent setters should now use the widget directly as well.
2014-10-13 15:43:10 +02:00
dfighter1985
126631020f
Size parent is now queried directly from the widget.
2014-10-13 15:26:47 +02:00
Nimetu
d938a90da6
Render table and cell borders
2014-10-13 01:59:20 +03:00
Nimetu
13b947861d
Add bordercolor attribute to table tag
2014-10-13 01:10:46 +03:00
dfighter1985
cc3e44ac2b
GUI Editor should show the right parent position.
2014-10-12 23:07:08 +02:00
dfighter1985
a96cdafb29
Parent positions should now be saved right again.
2014-10-12 23:05:22 +02:00
Nimetu
80e2d7fa35
Fix table cellpadding
2014-10-12 17:43:18 +03:00
dfighter1985
479625968d
Implemented new action.
2014-10-11 21:43:28 +02:00
dfighter1985
f5826add20
Moved CRootGroup out of CInterfaceParser.
2014-10-11 19:30:30 +02:00
dfighter1985
c47188179a
CInterfaceParser in editor mode should look for files in the working directory first.
2014-10-11 16:26:38 +02:00
dfighter1985
f6d34ddb37
Added limits to pch, should fix Linux build.
2014-10-11 13:04:03 +02:00
dfighter1985
c7bfb9cf20
Merged develop
2014-10-11 02:15:07 +02:00
dfighter1985
6c05ced558
Added support for grouping widgets.
2014-10-11 00:42:43 +02:00
dfighter1985
0aead6db70
Allow multiselection.
2014-10-10 20:25:25 +02:00
dfighter1985
20ccee370b
Unselect selection when clicking 'nothing'.
2014-10-10 17:33:57 +02:00
kervala
e4ab2467c1
Minor changes
2014-10-10 13:08:14 +02:00
kervala
9995543f47
Fix some warnings
2014-10-10 13:07:54 +02:00
kaetemi
a1262b71b2
Handle shadow outline in gui
2014-10-08 23:20:35 +02:00
kaetemi
523761d7b7
Implement text shade outline
2014-10-08 23:20:34 +02:00
dfighter1985
733fb56703
A little crash fix.
2014-10-08 21:28:20 +02:00
dfighter1985
a4dfd8c95e
Sizes should remain the same when ungrouping.
2014-10-08 21:00:56 +02:00
dfighter1985
003ddd6881
Added support for ungrouping.
2014-10-08 20:36:16 +02:00
dfighter1985
e9f5fef158
Make group selection optional.
2014-10-08 18:45:17 +02:00
dfighter1985
01cdcaa480
Only select a group first in editor mode.
2014-10-08 18:00:54 +02:00
dfighter1985
b524c9fec1
Don't try to handle the right mouse button actions in editor mode.
2014-10-08 17:59:39 +02:00
dfighter1985
1111a022af
When moving a group draw it's children too.
2014-10-08 17:52:56 +02:00
dfighter1985
4d06c3c278
Select groups first.
2014-10-08 17:37:05 +02:00
kaetemi
6ec644e2ba
Fix rendering of specially sized window highlights
2014-10-08 09:31:13 +02:00
kaetemi
d2e9352d4c
Fix when tx_b and tx_b_open have different heights
2014-10-08 09:30:59 +02:00
kaetemi
cbe5cb66f7
Add inset_t parameter to layer options, allows putting header graphics in top texture
2014-10-04 01:43:27 +02:00
kaetemi
96ea88ac07
Fix a bad copy paste in NLGUI
2014-10-04 01:43:13 +02:00
kaetemi
0eed48b902
Fix #207 , FXAA orientation under D3D
2014-10-01 23:24:56 +02:00
Jan Boon
2935767d60
Merged in nimetu/ryzomcore/html-maxlength-attr (pull request #84 )
...
Add maxlength attribute to input and textarea tags
2014-10-01 23:18:33 +02:00
dfighter1985
7504dc1238
From now on dragged widgets will be re-aligned on drop. They will find the nearest hotspot of the group they are dropped into, and calculate an offset so they will align to the hotspot and yet remain where they were dropped.
2014-09-29 20:29:04 +02:00
dfighter1985
4d5d67fac7
Update CCtrlTextButton's CViewText's coords after updating it's own coords.
2014-09-29 17:38:24 +02:00
dfighter1985
2383e19561
Posref changes in the editor should apply...
2014-09-29 17:23:22 +02:00
dfighter1985
e87d83bccc
Refactoring. Added CInterfaceFactory.
2014-09-27 21:48:51 +02:00
dfighter1985
fada6e7dcc
A little refactoring.
2014-09-27 20:15:46 +02:00
dfighter1985
75047b71b4
Move the text too with the text button.
2014-09-27 19:54:19 +02:00
dfighter1985
3ca518dca2
Merged develop
2014-09-27 18:22:44 +02:00
dfighter1985
039e8a83a4
Initialize struct member before use...
2014-09-27 18:20:29 +02:00
Nimetu
2b02fd2c37
Add maxlength attribute to input and textarea tags
2014-09-27 15:55:57 +03:00
dfighter1985
3fbe51185f
Merged develop.
2014-09-27 00:08:06 +02:00
dfighter1985
161c8e5edc
Editbox selection should be stopped when the mouse button goes up, even if it happens outside of the box.
2014-09-26 23:29:38 +02:00
dfighter1985
e6f4801129
Refactored IWidgetAdditionWatcher, now it's called IWidgetWatcher and it also reports widget moves.
2014-09-24 23:32:24 +02:00
dfighter1985
f7825fc8b3
No need for free floating elements when we can simply reparent to the top window...
2014-09-24 22:59:40 +02:00
dfighter1985
c5b8f30bb9
Orphaned widgets won't get stuck.
2014-09-24 20:40:37 +02:00
dfighter1985
f30054a26c
Add widget to a new parent when the widget being dragged is dropped, otherwise add it to the orphanlist so that it's drawn anyways. NOTE: The dropped widget can be clipped. If it is clipped, it never shows up even tho it's there.
2014-09-24 18:45:52 +02:00
dfighter1985
49d023d273
Set dragged widgets' coordinates based on the move rather than the mouse pointer's coords.
2014-09-24 16:31:26 +02:00
dfighter1985
574d24e5e3
Dragged elements will no longer disappear.
2014-09-24 16:20:25 +02:00
kaetemi
a943c939ef
Add useful default config variables to dev client
2014-09-24 12:34:40 +02:00
kaetemi
cdfbcfe1d8
Add some more practical data build batch scripts
2014-09-24 01:07:12 +02:00
kaetemi
3158f6d90e
Handle GUI event only once
2014-09-23 19:47:06 +02:00
dfighter1985
10c340e29a
Merged develop.
2014-09-22 23:58:48 +02:00
dfighter1985
d19e4ecaab
Studio should no longer crash when multiple plugins that use LIGO are loaded. LIGO classes are now guarded against multiple registrations. If it's tried log messages are generated. Mission Compiler and World Editor will now apply their own LIGO configs when the user switches to their tab.
2014-09-22 23:24:48 +02:00
dfighter1985
2666f19500
Merged develop
2014-09-19 20:10:00 +02:00
kaetemi
e8799f08aa
Add extra search paths
2014-09-19 19:48:17 +02:00
kaetemi
9d161fddf5
Add resave scripts
2014-09-18 17:40:07 +02:00
kaetemi
b9b58bd7dc
Add particle system path fixing script
2014-09-18 14:10:03 +02:00
kaetemi
3731f28892
Backed out incomplete changes to GL driver
2014-09-18 11:31:19 +02:00
dfighter1985
e40ecbda00
Merged the gui-editor branch.
2014-09-17 21:12:14 +02:00
kaetemi
62d567afca
Add cartographer
2014-09-14 16:37:24 +02:00
kaetemi
21d283edb0
Add pz process
2014-09-14 15:02:44 +02:00
kaetemi
302c478af6
Merge with develop
2014-09-12 15:19:12 +02:00
kaetemi
a62c795fac
ryzomcore/v0.10.0
2014-09-12 10:57:31 +02:00
kaetemi
5ac1d8f03b
Add data_common to executables_dev batch
2014-09-12 10:50:19 +02:00
kaetemi
b34c7cf12a
When in Rome, do as the Romans do
2014-09-11 10:36:41 +02:00
dfighter1985
60205f51e8
Merged default.
2014-09-10 20:18:00 +02:00
kaetemi
0d40dbc177
Add script for installing worldedit data
2014-09-10 16:38:19 +02:00
kaetemi
bdd7cc9b90
Nice try
2014-09-10 16:00:13 +02:00
dfighter1985
15f6ed3c37
Merged default.
2014-09-05 22:28:11 +02:00
dfighter1985
ca910cf17a
Added support for manipulating atoms.
2014-09-05 20:28:43 +02:00
kervala
ad5cc68107
Changed: Code formatting
2014-09-05 15:42:53 +02:00
dfighter1985
a875e66696
Implemented add and remove buttons.
2014-09-02 19:26:02 +02:00
dfighter1985
2292fc96c4
Apply changes.
2014-09-02 14:54:07 +02:00
kervala
5e8c5d2102
Changed: Including malloc/malloc.h is useless
2014-08-27 11:21:47 +02:00
kervala
891e0d1bd7
Fixed: Use ...ARBPROC declarations for ARB_occlusion_query (to fix a conflict with official OpenGL headers under Mac OS X)
2014-08-27 11:19:20 +02:00
kervala
05be67e263
Fixed: Compilation under Mac OS X (malloc is already aligned on 16 bytes and memalign doesn't exist)
2014-08-27 11:16:30 +02:00
kaetemi
119c931738
Link group_wheel.cpp, ref #176
2014-08-25 14:56:29 +02:00
kaetemi
0f236b800f
Merge with default
2014-08-19 15:43:49 +02:00
dfighter1985
e59fb841bc
Merged default.
2014-08-19 00:33:03 +02:00
kaetemi
a119349a7e
Crashfix in case pacs_prim are exported into .ig
2014-08-18 20:23:27 +02:00
kaetemi
98fadea8bf
Fix shape lightmap optimize
2014-08-17 19:40:43 +02:00
kaetemi
0fdba79819
Crashfix in case pacs_prim are exported into .ig
2014-08-17 19:37:20 +02:00
kaetemi
45db7f57eb
Crashfix in case pacs_prim are exported into .ig
2014-08-17 16:48:51 +02:00
kaetemi
ef9a0d8184
Crashfix in case pacs_prim are exported into .ig
2014-08-17 16:41:09 +02:00
kaetemi
6e4a14740c
Crashfix in case pacs_prim are exported into .ig
2014-08-17 16:22:56 +02:00
kervala
d2419ff74e
Merge
2014-08-17 16:08:25 +02:00
kervala
74a30afcc4
Changed #172 XML floating point serialization not using neutral culture
2014-08-17 16:05:51 +02:00
kaetemi
85cd41355d
Additional fix #172 set _Locale to NULL after release
2014-08-17 16:02:51 +02:00
kaetemi
7c328658fb
Fix continent path bug
2014-08-17 15:58:42 +02:00
kervala
4f4a3469d3
Fixed #172 XML floating point serialization not using neutral culture
2014-08-17 15:39:30 +02:00
kaetemi
0baeffd1a1
Merge with default
2014-08-16 15:05:32 +02:00
kaetemi
4d4a885f7a
Maxscript selection clear fix
2014-08-16 14:51:29 +02:00
kaetemi
2cd74c193f
Zone light exporter adjust
2014-08-16 14:51:29 +02:00
kaetemi
f731d220d7
Project client loading screens into 3D space for HMD
2014-08-07 18:49:05 +02:00
kaetemi
b31f939f9e
Non-functional direct to rift
2014-08-07 05:09:11 +02:00
kaetemi
338b9b8a7f
GL: Fix switch from different resolution fullscreen to borderless display
2014-08-07 04:45:14 +02:00
kaetemi
60c4e36fec
Clean handling of display mode switching in client
2014-08-07 04:36:51 +02:00
kaetemi
c2d39e8bdf
GL: Handle borderless fullscreen to specified monitor internally
2014-08-07 04:18:17 +02:00
kaetemi
7bd9216a6f
Specify monitor when changing display mode
2014-08-07 01:04:58 +02:00
dfighter1985
04095561cb
Merge default
2014-08-07 00:03:09 +02:00
kaetemi
7db83ce7da
Process some scene traversals only once when rendering in stereo
2014-08-06 14:36:09 +02:00
kaetemi
758e87e115
OVR: Chroma factor
2014-08-05 20:14:58 +02:00
kaetemi
0c7bc1240f
OVR: Fix for debug devices
2014-08-05 04:03:27 +02:00
kaetemi
031f1cdcbd
OVR: Convert texture coordinates and setup rendering material
2014-08-05 03:54:19 +02:00
kaetemi
c9762fbef5
3D: Ensure correct fog handling for effects
2014-08-05 02:58:55 +02:00
dfighter1985
cc12fb91b4
Tile loading more or less works. TODO: investigate why displacement map lookup causes crashes.
2014-08-05 02:58:31 +02:00
kaetemi
19209b8028
OVR: Test distortion mesh
2014-08-05 02:55:26 +02:00
kaetemi
537a7e7395
OVR: Test large render target
2014-08-05 02:25:14 +02:00
kaetemi
32540add2a
3D: Set matrix modes after changing render target in effect
2014-08-05 02:24:11 +02:00
kaetemi
240889b03d
3D: Render target matrix context fix
2014-08-05 02:21:30 +02:00
kaetemi
fb16438a49
OVR: Testing
2014-08-05 01:49:45 +02:00
kaetemi
4a8d07b889
OVR: Translate camera
2014-08-05 00:51:53 +02:00
kaetemi
30f98c4b62
OVR: Get orientation
2014-08-05 00:46:04 +02:00
kaetemi
2dda6cc5f0
OVR: Generate distortion mesh
2014-08-05 00:20:21 +02:00
kaetemi
c99cfed0dd
OVR: Read device descriptions
2014-08-04 20:32:31 +02:00
kaetemi
05a2f91711
OVR: Iterate devices
2014-08-04 19:19:15 +02:00
kaetemi
0baada5110
Cleanup
2014-08-04 18:31:31 +02:00
kaetemi
ca165de62c
Add placeholders for LibOVR 0.4.0 support
2014-08-04 18:30:25 +02:00
kaetemi
b24fa74936
3D: Fix texture coords for FXAA on D3D
2014-08-04 07:38:40 +02:00
kaetemi
925aa9c715
Remove debug
2014-08-04 06:19:03 +02:00
kaetemi
946128cdca
3D: User higher quality FXAA version
2014-08-04 06:11:47 +02:00
kaetemi
650e634e68
3D: Add FXAA
2014-08-04 04:44:27 +02:00
kaetemi
a72b200fe8
Fix crash on AMD with legacy clouds
2014-08-04 01:05:53 +02:00
kaetemi
5e9fc17402
Move default render target handling to CDriverUser
2014-08-04 00:57:43 +02:00
kaetemi
8c6d46bed0
Adjust render target handling for effects
2014-08-03 22:15:44 +02:00
kaetemi
996dd9aa16
Merge with default
2014-08-03 22:15:39 +02:00
kaetemi
2ad030f5f9
GL: Occlusion query bugfix
2014-08-03 22:15:12 +02:00
dfighter1985
80f7dd725d
Started to rework tile checks, tile banks loading / saving. A tilebank will now be in the tilemodel, and it will work from there. Also moved some constants into an independent file.
2014-08-03 21:33:13 +02:00
kaetemi
f03f73e5c8
3D: Cleanup bloom effect
2014-08-03 21:09:55 +02:00
kaetemi
2bccba1ddc
3D: Cleanup bloom effect
2014-08-03 20:35:05 +02:00
kaetemi
f9aa0bf7cc
GL: Share depth and stencil to get similar behaviour to D3D driver
2014-08-03 18:59:19 +02:00
kaetemi
54f4d5bac3
Simplify GUI projection settings
2014-08-03 00:56:26 +02:00
kaetemi
9d883e227c
Off-center GUI cylinder
2014-08-02 20:11:28 +02:00
kaetemi
5580d0b761
Cylindrical GUI
2014-08-02 19:50:26 +02:00
kervala
5f5f0dd76c
Changed: #172 XML floating point serialization not using neutral culture (for VC++ 2005 and up)
2014-08-02 11:18:24 +02:00
kervala
9f3717bda0
Fixed: build_interface currently only works with 32 bits bitmaps
2014-08-02 10:58:50 +02:00
kervala
97fcba17cd
Fixed: VC++ 2010 compiler bug in for loop variables reuse
2014-08-02 10:57:31 +02:00
kervala
6fb6baeb90
Fixed: Some NeL tools in 3d directory don't need NeL 3D
2014-08-01 17:17:53 +02:00
kervala
a2c797551d
Fixed: Compilation of PACS tools without NeL 3D
2014-08-01 17:00:08 +02:00
kaetemi
9e23a689ae
Project GUI into space
2014-08-01 15:44:12 +02:00
kaetemi
6de844b43c
Temporary crashfix, ref #68
2014-08-01 15:23:13 +02:00
kaetemi
0adb5be855
Restore camera and scene viewport after disabling VR
2014-08-01 13:20:55 +02:00
kaetemi
03e367be86
Merge with default
2014-08-01 11:50:40 +02:00
kaetemi
655d709ceb
Render target format (for alpha)
2014-07-31 18:25:50 +02:00
kaetemi
74c4c09211
Fix issue with render target in OpenGL when size not specified
2014-07-31 17:41:56 +02:00
kaetemi
029d9bddfe
Mode2D selection
2014-07-31 03:53:38 +02:00
kaetemi
a6812f5844
Merge with game-device
2014-07-31 02:07:20 +02:00
kaetemi
64666c302a
Add render target manager, issue #47
2014-07-31 00:46:00 +02:00
kaetemi
5de85eb194
Merge with default
2014-07-30 22:32:27 +02:00
kaetemi
af99ad6085
Bugfix
2014-07-30 21:47:48 +02:00
kaetemi
98db1841c3
Fix XRef ligo export
2014-07-30 20:56:28 +02:00
kaetemi
fa64fb9359
Faster ligo export step
2014-07-30 20:56:28 +02:00
kaetemi
c062aab85a
Crashfix for 3ds Max export
2014-07-30 20:56:28 +02:00
dfighter1985
e82ffc9b14
TileBank loading.
2014-07-30 10:54:08 +02:00
kaetemi
8c58150e83
ryzomcore/v0.9.1
2014-07-29 19:21:25 +02:00
kaetemi
7d835464f0
Crash workaround in IG loading, ref #171
2014-07-31 19:50:25 +02:00
kaetemi
21282fe62e
Cleanup
2014-07-29 16:48:14 +02:00
kaetemi
413fb4bfbe
Fix Skin export interface issue, #169
2014-07-29 15:42:11 +02:00
kaetemi
f563a9642e
Add warning
2014-07-29 15:23:51 +02:00
kaetemi
1c1d7a2e4a
Crashfix Physique export
2014-07-29 15:23:06 +02:00
kaetemi
b74a24a312
Remove a debug assert
2014-07-29 14:39:07 +02:00
kaetemi
56c6bf21fd
Bugfix
2014-07-29 14:25:28 +02:00
kaetemi
c447405078
Initialize object viewer viewport at correct size
2014-07-29 14:10:40 +02:00
kaetemi
268d692b03
Compile fix
2014-07-29 14:09:08 +02:00
dfighter1985
8971f98722
Merged default.
2014-07-22 00:15:50 +02:00
kervala
b7cf2d3774
Fixed: Initialization of pointers in constructor
2014-07-19 14:02:43 +02:00
kervala
875ab80728
Changed: Minor optimization and warning
2014-07-19 14:01:44 +02:00
kervala
853b6aba0b
Changed: Replaced tests with .size() by .empty() because faster
2014-07-19 14:01:03 +02:00
kervala
dbbb344bde
Changed: Minor change
2014-07-19 11:24:07 +02:00
kervala
0d81bb48b8
Changed: Some Big endian swaps (for PowerPC especially)
2014-07-19 11:23:49 +02:00
kervala
0d83dd9162
Fixed: Warning
2014-07-19 11:16:43 +02:00
kervala
389037c26e
Changed: Replaced atof by NLMISC::fromString
2014-07-19 11:14:38 +02:00
KISHAN GRIMOUT
77d1f8e4bc
fix windows 64-bit crash in client due to VS 64-bit compiler bug, fix #164
2014-07-16 13:47:08 +02:00
kaetemi
b6e703d8f7
Fix self illumination color widget in NeL Material script
2014-07-28 18:32:05 +02:00
kaetemi
1140181fe3
Fix NeL Material script defaults, fix #166
2014-07-28 18:31:40 +02:00
kaetemi
0bcbb3f4aa
Adjust 3ds Max plugin versioning info
2014-07-28 18:31:20 +02:00
kaetemi
b24f979569
Add callback template class
2014-07-12 18:19:25 +02:00
kaetemi
dc17e72ad3
Higher quality outline, visual difference is relevant only for black
2014-10-16 02:00:45 +02:00
Laszlo Kis-Adam
606f0f483f
Merged in dfighter1985/ryzomcore/dfighter-tools (pull request #94 )
...
Just too lazy to push directly
2014-10-15 19:48:23 +02:00
kaetemi
de026fe48c
Don't use I18N when the required ui prefix is not in the tooltip text (convention actually dictates uitt as tooltip prefix)
2014-10-14 23:45:08 +02:00
kaetemi
32a144a282
Shadow should not be taken into account for font height, breaks vertical centering
2014-10-14 23:45:08 +02:00
kaetemi
18ade6cbd4
Trash DirectInput
2014-07-12 17:17:24 +02:00
dfighter1985
2ca6c73d09
Texture chooser now supports atlas textures as well.
2014-07-09 21:07:12 +02:00
kaetemi
3650ef83b7
Fix #162 : Center ingame mouse cursor after login
2014-07-09 12:31:22 +02:00
kaetemi
24e8caf0fb
Formatting: Use tabs
2014-07-09 16:59:55 +02:00
KISHAN GRIMOUT
bd257f42c7
fix windows 64bit build in mem_displayer.cpp
2014-07-09 13:41:43 +02:00
kaetemi
0f5f1f9047
Trash DirectInput
2014-07-08 22:21:11 +02:00
dfighter1985
c736145c2f
CPath can now return the file list with a path filter.
2014-07-06 23:21:25 +02:00
dfighter1985
668bbc1780
Added facilities for viewing the loaded actions.
2014-07-02 22:27:04 +02:00
dfighter1985
0dfb7a091c
Quelled some compiler compliants.
2014-06-29 03:01:43 +02:00
dfighter1985
c8c162308d
tooltip parent is now changable using an enum.
2014-06-29 02:53:33 +02:00
dfighter1985
5deea1a13b
Tooltip posrefs are now enums in the GUI Editor.
2014-06-29 01:44:06 +02:00
dfighter1985
afd1d96363
text posref is now an enum too.
2014-06-27 00:07:44 +02:00
dfighter1985
87778c86c9
Posref can now be set as an enum, instead of a string in the property editor.
2014-06-21 18:25:14 +02:00
kaetemi
dd52a05d02
Don't enforce native fragment programs on modern hardware. Fixes water for the open source ATI/AMD driver, which reports fragment programs as not native (as they are translated to modern hardware).
2014-06-21 06:41:14 +02:00
kaetemi
9e0b573141
Exit with error
2014-06-21 05:46:20 +02:00
kaetemi
502d81c428
Fix compile
2014-06-20 23:38:44 +02:00
kaetemi
a6195bcee7
Fix compile
2014-06-20 23:24:54 +02:00
kaetemi
2753b49b45
Compile fix
2014-06-20 17:53:38 +02:00
kaetemi
39894f4a99
SSE2: Compile fix
2014-06-20 03:08:51 +02:00
kaetemi
2a87923ced
SSE2: Replace prefetch
2014-06-14 01:09:05 +02:00
kaetemi
92d00936aa
SSE2: Ensure correct allocator is used
2014-06-14 00:38:35 +02:00
kaetemi
f51843a721
SSE2: Remove dead code
2014-06-13 22:21:07 +02:00
kaetemi
56c59d114d
SSE2: Fix for MinGW
2014-06-19 00:05:43 +02:00
kaetemi
b9576c93dd
Merge with default
2014-06-20 03:01:32 +02:00
kaetemi
0c3baeb4de
Implement occlusion queries for AMD/ATI in the OpenGL driver
2014-06-19 21:49:33 +02:00
kaetemi
8967f57fdf
Backed out changeset: f665fcc42968 (except dru.cpp)
2014-06-19 20:22:12 +02:00
kaetemi
00528e1cd6
Fix Ryzom server compile under MinGW
2014-06-19 20:19:39 +02:00
kaetemi
fa373017f8
Fix NeL GUI compile under MinGW
2014-06-19 00:40:29 +02:00
kaetemi
76704a9952
Fix XA2 driver compile under MinGW
2014-06-18 23:18:06 +02:00
kaetemi
2c6b53c53e
Fix NeL Tools compile under MinGW
2014-06-18 21:05:39 +02:00
kaetemi
a4c86ddf20
Fix D3D driver compile under MinGW
2014-06-18 16:29:02 +02:00
kaetemi
a47d71713f
Fix Snowballs service compile under MinGW
2014-06-18 12:52:03 +02:00
kaetemi
a5b2b269a9
Fix NeL Samples for MinGW
2014-06-18 12:40:53 +02:00
kaetemi
9f699b4923
Fix Snowballs compile under MinGW
2014-06-18 02:05:54 +02:00
kaetemi
275f18d6ab
Fix linking of OpenGL driver under MinGW
2014-06-18 01:21:05 +02:00
kaetemi
fc9dc1471a
Fix linking of OpenAL driver under MinGW
2014-06-18 00:28:08 +02:00
kaetemi
6807d72136
Fix compilation of NL3D under MinGW
2014-06-17 22:33:56 +02:00
kaetemi
5a48e60763
Fix compilation of NLNET under MinGW
2014-06-17 21:56:53 +02:00
kaetemi
5b47ca4709
Fix compilation of NLMISC under MinGW
2014-06-17 21:48:25 +02:00
kaetemi
0420fea931
SSE2: Add macro for force inline
2014-06-13 20:25:45 +02:00
kaetemi
7929f78dd7
SSE2: Align CMatrix
2014-06-13 19:33:09 +02:00
kaetemi
78ccdb16b7
SSE2: Implement alignment for arena allocator
2014-06-13 19:26:22 +02:00
kaetemi
12c636d747
SSE2: Add aligned allocators
2014-06-13 19:12:31 +02:00
kaetemi
e0f0fe2650
Set additional preferred memory
2014-06-05 15:51:25 +02:00
kaetemi
70d798d5fb
Cleanup extension initialization
2014-06-05 15:03:09 +02:00
kaetemi
35b01fc3a9
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
kaetemi
30072a64c9
Set exec mode
2014-05-23 22:39:50 +02:00
kaetemi
b932a7de2a
Add --admininstall parameter to c1_shard_patch
2014-05-23 17:25:52 +02:00
kaetemi
1bd6e0993a
Fix Windows compilation of lightmap_optimizer
2014-05-23 01:57:19 +02:00
liria
b4b1e639fd
Merged default into lightmap_optimizer_port_to_linux
2014-05-15 16:36:59 +02:00
dfighter1985
9ee5a37ffd
Merged default
2014-05-14 18:01:15 +02:00
dfighter1985
f32545dda8
Moved ovqt to /code/studio
2014-05-06 01:30:28 +02:00
kaetemi
fb56ef3fdc
Merge
2014-04-30 12:57:54 +02:00
kaetemi
c93b04df1d
Backed out changeset: 897087f1fa71, 7c3f1f0dc9d8, 61d11f94e3ea
2014-04-30 12:54:20 +02:00
kaetemi
989965e33f
Fix EOL
2014-04-30 12:53:06 +02:00
kervala
eedaee3da3
Changed: Replaced strlwr by toLower
2014-04-24 22:59:29 +02:00
kervala
22374fb124
Fusion avec default
2014-04-24 19:16:42 +02:00
kervala
4da04fdfaa
Changed: Replaced strlwr by toLower
2014-04-24 18:11:16 +02:00
Nimetu
6217b46193
Fix compiling on linux with new OpenGL headers (issue #145 )
2014-04-23 23:23:23 +03:00
dfighter1985
c83ccc76bb
Tile Editor crash fixes.
2014-04-23 02:10:14 +02:00
dfighter1985
324aa7f851
Build fixes.
2014-04-23 00:49:17 +02:00
dfighter1985
e24447e98c
Merged Georges Editor branch.
2014-04-22 21:12:26 +02:00
dfighter1985
392061f06b
Merged default.
2014-04-22 21:10:19 +02:00
dfighter1985
04b2b69909
Merged default.
2014-04-22 21:02:34 +02:00
dfighter1985
916c9bf919
We can now drag elements, they will disappear and whatnot, but at least they can be dragged!
2014-04-21 19:30:33 +02:00
dfighter1985
83e0c1ceda
Refactored input event handling a bit.
2014-04-20 21:41:57 +02:00
dfighter1985
8c23925246
Merge default.
2014-04-19 21:53:29 +02:00
kervala
59042ccb6a
Changed: Updated OpenGL and OpenGL ES headers
2014-04-17 10:44:03 +02:00
kervala
396948f89a
Fixed: nglXSwapIntervalEXT return type should be void
2014-04-17 10:16:30 +02:00
liria
89097aa4a1
Typo correction
2014-04-05 13:49:14 +00:00
liria
610226d100
Merged default into lightmap_optimizer_port_to_linux
2014-04-05 15:40:17 +02:00
kaetemi
9edd54c446
Add interface for HMD with player death support
2014-04-01 13:14:44 +02:00
kervala
cd04a596cd
Backed out changeset: 3937923211ec
2014-03-29 12:45:22 +01:00
kervala
213749f410
Changed: Replaced some Mac OS X warnings by TODO comments
2014-03-27 16:36:00 +01:00
kervala
b118643bbd
Changed: Aligned methods names
2014-03-27 16:34:55 +01:00
kervala
9f628090cf
Changed: Aligned methods names
2014-03-27 16:34:55 +01:00
kervala
85ab0dba81
Fixed: Switch not handled warnings
2014-03-27 15:53:19 +01:00
kervala
479f31ef3b
Fixed: Warnings with clang: wrong ! and == operators order
2014-03-27 15:50:58 +01:00
kervala
7d4b89afc9
Fixed: Warnings with clang: wrong ! and == operators order
2014-03-27 15:50:58 +01:00
kervala
0d98d8d0b3
Changed: Removed useless definitions
2014-03-27 13:39:46 +01:00
kervala
b03b2cc5fb
Changed: Removed useless definitions
2014-03-27 13:39:46 +01:00
kervala
4b89a89004
Changed: Updated OpenGL headers
2014-03-27 13:39:16 +01:00
kervala
46fccf9902
Changed: Updated OpenGL headers
2014-03-27 13:39:16 +01:00
kervala
ed1b73948d
Changed: Give priority to ARB extensions in tests
2014-03-26 14:36:00 +01:00
kervala
654583807c
Changed: Detect available video memory with OpenGL extensions
2014-03-26 14:34:07 +01:00
kervala
5333ec3420
Changed: Detect available video memory with OpenGL extensions
2014-03-26 14:34:07 +01:00
kervala
d7f7523bdf
Changed: Use OpenGL ES functions prototypes from official headers
2014-03-26 14:32:00 +01:00
kervala
9fd642d24b
Changed: Use OpenGL ES functions prototypes from official headers
2014-03-26 14:32:00 +01:00
kervala
741f806f16
Changed: Optimize OpenGL driver PCH
2014-03-26 14:31:32 +01:00
kervala
091c22bf10
Changed: Optimize OpenGL driver PCH
2014-03-26 14:31:32 +01:00
kervala
efcdbd2424
Changed: Use OpenGL functions prototypes from official headers
...
Fixed: glDeleteObjectBufferATI replaced by glFreeObjectBufferATI since 2002
2014-03-26 14:14:36 +01:00
kervala
1f60ea7fdf
Changed: Use OpenGL functions prototypes from official headers
...
Fixed: glDeleteObjectBufferATI replaced by glFreeObjectBufferATI since 2002
2014-03-26 14:14:36 +01:00
kervala
76d7f4b620
Changed: Typo
2014-03-22 16:23:28 +01:00
kaetemi
7e6cf7c213
Fix crash in 0_setup.py on Linux
2014-03-15 09:12:40 +01:00
kaetemi
49fd01ccfb
Add color to console output
2014-03-13 18:34:26 +01:00
kaetemi
979502cbdd
Separate output directories from input directories
2014-03-12 19:19:52 +01:00
Jan Boon
f2536515ec
Merged in StudioEtrange/ryzomcore/ovqt-fixes (pull request #54 )
...
OVQT Plugins - CMake Install fixes
2014-02-21 04:53:06 +01:00
kaetemi
e8c482d36c
Disable build of dataset packed sheets in build pipeline
2014-02-20 20:15:18 +01:00
kaetemi
14a6776d0b
Update default directories
2014-02-20 03:37:23 +01:00
kaetemi
4433139a8e
Add script for creating a new shard patch
2014-02-20 03:09:31 +01:00
kaetemi
0934e84757
Rename scripts
2014-02-20 01:31:09 +01:00
kaetemi
3c5d35137d
Nicer batch scripts for pipeline
2014-02-20 01:06:29 +01:00
kaetemi
78f6aa1ce9
Add build process script for shard sheets
2014-02-19 23:51:55 +01:00
kaetemi
65b29b38e5
Additional streaming behaviour fix for XAudio2 driver
2014-02-17 00:20:29 +01:00
kaetemi
374f6a99ed
Remove some debug
2014-02-16 20:44:58 +01:00
kaetemi
b19971fe3f
Fix some streaming behaviour in XAudio2 driver
2014-02-16 20:36:58 +01:00
StudioEtrange
3da6355d73
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
kaetemi
2c81edcf56
Additional streaming behaviour fix for XAudio2 driver
2014-02-17 00:20:29 +01:00
kaetemi
5db0ba86a7
Remove some debug
2014-02-16 20:44:58 +01:00
kaetemi
3b38848903
Fix some streaming behaviour in XAudio2 driver
2014-02-16 20:36:58 +01:00
kervala
bb156457c0
Changed: Typo
2014-03-22 16:23:28 +01:00
kaetemi
c6e291c470
Only copy if needed
2014-02-14 02:46:07 +01:00
kaetemi
870444293f
Merge
2014-02-14 02:38:53 +01:00
kaetemi
f4a4a41fbf
Fix default directory
2014-02-14 02:03:22 +01:00
kaetemi
93a6e13d5e
Extend shard data script to gather executables and configurations
2014-02-14 01:21:05 +01:00
kaetemi
3860006530
Add directories for patchman to gamedata setup
2014-02-14 01:01:02 +01:00
kaetemi
46ab8acea7
Extend shard data script
2014-02-13 22:02:25 +01:00
botanic
b09fb394da
Backed out merge changeset: b2d97621fa3b
...
Backed out merge revision to its first parent (99840e8413f2)
2014-02-13 12:12:28 -08:00
kervala
81aa2a236a
Fixed: Reverted i18n change
2014-02-13 14:17:32 +01:00
kaetemi
0b3186ac6a
Clean translation diffs from OLDVALUE comments before merge, issue #116 , patch provided by Łukasz K
2014-02-12 16:35:07 +01:00
kaetemi
46bf57aaf7
Fix make_merge_wk for uxt
2014-02-10 16:38:04 +01:00
kaetemi
0366f021ea
Cleanup
2014-02-09 22:35:01 +01:00
kaetemi
c9437f9bd5
Cleanup
2014-02-09 22:21:30 +01:00
kaetemi
e90c325f1b
Merge
2014-02-09 22:15:33 +01:00
kaetemi
ad40eb6450
Fix the bug that caused the shape exporter to crash
2014-02-09 22:12:44 +01:00
kaetemi
aaad67a5e5
Cleanup
2014-02-09 21:53:49 +01:00
kaetemi
c0e55b4cc6
Fix export of NeL Flare
2014-02-09 17:26:26 +01:00
Matthew Lagoe
4308e65f97
Merged in botanic/ryzomcore-botanic-testing (pull request #21 )
...
Make it so that bad text always throws a nlwarning
2014-02-08 18:33:27 -08:00
kaetemi
b4c2c28ee6
Remove pacs.packed_prims when done
2014-02-09 02:42:45 +01:00
kaetemi
bce5b31a6a
Move visual slot tab to separate directory
2014-02-09 02:40:14 +01:00
kaetemi
28235008ea
Fix typo
2014-02-08 23:57:39 +01:00
kaetemi
f97dfa1d09
Implement skip for rbank process
2014-02-08 23:43:42 +01:00
kaetemi
3fadcb1f53
Implement skip for ig elevation
2014-02-08 22:54:25 +01:00
kaetemi
8dc1a89440
Implement skip for zone dependency process
2014-02-08 22:23:24 +01:00
kaetemi
a5282ccb7e
Get properties search paths from python variable
2014-02-08 22:07:33 +01:00
kaetemi
045e0c3ec6
Fix lightmap optimize skip
2014-02-08 21:09:35 +01:00
kaetemi
23cf77ea2f
Implement skip for coarse mesh build process
2014-02-08 21:02:24 +01:00
kaetemi
c04eea9a22
Implement skip for shape lightmap optimize build process
2014-02-08 20:02:57 +01:00
kaetemi
76009d8b05
Implement skip for interface build process
2014-02-08 19:44:52 +01:00
kaetemi
4a71690859
Add script to automatically merge translation wk files
2014-02-08 17:36:17 +01:00
kaetemi
b7fe5153d3
Add script to make and merge all translation diffs
2014-02-08 17:10:34 +01:00
kaetemi
3481ad75e8
Add short translation procedure readme
2014-02-08 17:01:13 +01:00
kaetemi
2e9aaf3f33
Merge
2014-02-08 16:26:01 +01:00
kaetemi
7c901bf5d8
Improve leveldesign_dev.bat
2014-02-08 16:24:56 +01:00
botanic
777aa0b6ae
Add CMAKE option and NVIDIA PerfHUD support
2014-02-07 19:49:40 -08:00
kaetemi
6976f9e4fa
Adjust default paths
2014-02-08 01:34:16 +01:00
kaetemi
134ddf193a
Add clause translation tool scripts
2014-02-08 01:03:01 +01:00
kaetemi
db53075a4f
Add translation tool scripts
2014-02-08 00:23:42 +01:00
kaetemi
4009f03f4c
Add translation directory to pipeline setup
2014-02-08 00:03:56 +01:00
kaetemi
7fb942cbbf
Copy refs in client install
2014-02-07 19:35:55 +01:00
kaetemi
01850f9b96
Add refs to patch xml
2014-02-07 18:30:55 +01:00
kaetemi
f9c9fbd0be
Reorder pipeline scripts
2014-02-07 18:10:09 +01:00
kaetemi
b5d354a92b
Add world edit data install directory to pipeline setup
2014-02-07 18:04:23 +01:00
kaetemi
fe36caf6fc
Typo
2014-02-07 17:23:34 +01:00
kaetemi
343f7e8c39
Add build shadow skin to shape process
2014-02-07 17:16:40 +01:00
kaetemi
f223a551ad
Generate correct client.cfg data path for dev client
2014-02-07 15:26:15 +01:00
kaetemi
719a316acd
Replace shard install script
2014-02-07 14:53:47 +01:00
kaetemi
332b17c382
Remove duplicate tool
2014-02-07 02:17:42 +01:00
kaetemi
9dce6793b2
Fix thread lockup in zone lighter
2014-02-07 02:01:23 +01:00
kaetemi
7ed267dd7d
Backed out changeset: de1de16eef3b
2014-02-07 01:49:39 +01:00
kaetemi
68f1440967
Include world editor files directory in prim export
2014-02-07 01:49:16 +01:00
kaetemi
c82c82c44d
Improve debug message
2014-02-07 01:49:01 +01:00
kaetemi
0d317d64c6
Let prim checker only open files with ig extension
2014-02-07 01:01:36 +01:00
kaetemi
9ef5fcaacd
Add primitives directory to rbank lookup (needed file_index.cfg - is this the correct primitives dir?)
2014-02-07 01:01:19 +01:00
kaetemi
29a70767b4
Merge with default
2014-02-07 00:11:12 +01:00
kaetemi
8647d960b6
Include world editor files in rbank process, part of what caused water not to build
2014-02-06 23:58:18 +01:00
kaetemi
964e1a4bb7
Add more paths to the build gamedata configuration
2014-02-06 23:49:54 +01:00
kaetemi
fc0406eb77
Build pacs prim list txt outside repository
2014-02-06 22:10:56 +01:00
kaetemi
5540ec9375
Add separate target directory for shard data
2014-02-06 21:44:14 +01:00
kaetemi
f37ed8c753
Update default paths
2014-02-06 20:31:43 +01:00
kaetemi
652f6b5247
Merge with default
2014-02-06 20:16:18 +01:00
kaetemi
80477df91e
Merge with default
2014-02-06 19:54:15 +01:00
kaetemi
7989e9e6bc
Do not select stereo display debugger when HMD is set to Auto in Snowballs
2014-02-04 20:52:15 +01:00
kaetemi
f3a1dad1d2
Remove georges4cvs feature
2014-02-03 01:25:02 +01:00
kaetemi
ce88e5836a
Remove georges4cvs feature
2014-02-03 00:16:35 +01:00
kervala
62e62d2e72
Fixed: Compilation under Mac OS X 10.9 (new libc++ tr1 namespace is std not std::tr1)
2014-01-30 16:14:25 +01:00
kervala
37d36e0ab5
Fixed: Compilation under Mac OS X 10.9
2014-01-30 14:43:51 +01:00
botanic
a8cabc90d1
Fixed typo issue 60
2014-01-28 11:41:26 -08:00
botanic
8c4a6fc2da
Issue #60
...
does seem to work better when latency is high
2014-01-26 03:20:00 -08:00
botanic
fad0671af1
Merge
2014-01-26 02:58:42 -08:00
botanic
95c63bc0dd
Fix for Issue #94
2014-01-26 02:57:59 -08:00
kervala
f256e78b2c
Changed: Best fix for Freetype new layout (we only just need to include ft2build.h as done in font_generator.h)
2014-01-26 11:03:33 +01:00
liria
b1fb181b56
use NEL CFile function for file test
2014-01-25 17:09:07 +01:00
liria
afbe00fc39
Merged default into lightmap_optimizer_port_to_linux
2014-01-25 13:52:12 +01:00
liria
0e48ab1a38
make the programm compile on linux plateform
2014-01-25 11:50:14 +01:00
kervala
0e57ad38c3
Fixed: Compilation with freetype
2014-01-25 10:45:57 +01:00
kervala
7ee9607f41
Changed: Enable ig_elevation everywhere (patch by Liria)
2014-01-23 13:08:11 +01:00
liria
9d39e8b0a0
Merged default into ig_elevaton_port_to_linux
2014-01-23 00:49:56 +01:00
liria
39948bd5c7
CMakeLists.txt edited online with Bitbucket - remove merge conflict with default branche
2014-01-22 23:49:11 +00:00
kaetemi
6d39fd64b3
Fix Qt build on Windows
2014-01-21 12:50:23 +01:00
Nimetu
c37850920a
Remove tooltip debug message from logs
2014-01-04 00:20:05 +02:00
Nimetu
f26e595ad3
Fix typo (issue #70 )
2014-01-03 19:51:50 +02:00
Nimetu
2c38c21a40
Add deadlock counter to prevent endless loop (issue #73 )
2014-01-03 19:11:49 +02:00
botanic
b358155f73
dont force null driver, doesnt work on all cards and disable maximising max while running pipeline
2013-12-30 10:03:49 -08:00
botanic
ef83530ccc
un kaetemi'd the pipeline
2013-12-30 08:59:59 -08:00
botanic
7a8dd2829f
added single bat file to run whole pipeline
2013-12-29 23:25:09 -08:00
kervala
eb7299b8eb
Changed: #85 Compilation with STLport + EOL
2013-11-22 11:25:53 +01:00
kervala
fae156d22d
Fixed : #85 Compilation with STLport
2013-11-22 11:25:12 +01:00
kervala
559e5ed395
Fixed: Assign instead of comparison
2013-11-22 11:20:07 +01:00
kervala
925a97ad85
Fixed: Verbose warning
2013-11-13 22:23:57 +01:00
kervala
5df1ebf8ba
Fixed: Compilation under Mac OS X
2013-11-13 22:23:24 +01:00
kervala
ca82fcfe0c
Fixed: Warning with clang
2013-11-13 22:23:02 +01:00
kervala
1d46a6f94e
Changed: Don't need to change _PolygonSmooth if value is the same
2013-11-13 21:55:14 +01:00
kervala
1a5100bd93
Changed: Implement VSync under Mac OS X
2013-11-13 21:54:45 +01:00
kervala
43b87ff588
Changed: Replace strlwr by toLower
2013-11-13 21:53:21 +01:00
kervala
c2045c928d
Fixed : #77 crash when using lua:parseInterfaceFromString() (a big thanks to nimetu for the fix !)
2013-11-13 21:52:21 +01:00
kervala
0b400ae0c2
Fixed: Wrong algorithm
2013-11-13 21:46:42 +01:00
kervala
57a4c0ece1
Changed: EOL
2013-11-13 21:45:06 +01:00
kervala
b7feea6c95
Fixed: Warning with clang
2013-11-13 21:40:41 +01:00
kervala
753c5d6378
Changed: Replaced atof by fromString
2013-11-13 21:37:28 +01:00
kervala
5f0a674ad2
Changed: Updated OpenGL registry
2013-11-13 20:31:08 +01:00
Botanic
8ec1ee4d45
Merge
2013-11-02 16:35:26 -07:00
sfb
35cf55adca
Bad logging, content is unsigned const char*, fixed it to use %s and not cast.
2013-10-28 12:58:08 -05:00
sfb
2220c593f5
Bad merge resolution, fixed a couple source files which merged poorly.
2013-10-28 11:24:31 -05:00
sfb
436970dc46
Bad merge resolution, fixed the build files that merged poorly.
2013-10-28 11:24:02 -05:00
sfb
e9b8e2edba
merge from default
2013-10-23 12:08:09 -05:00
Matt Raykowski
8c046cf4c0
Merged in DJanssens/quitta-ryzomcore (pull request #25 )
...
Ryzom AMS - GSOC Project
2013-10-19 16:02:52 -05:00
kaetemi
08a4d9eb11
Fix #67 bad NELID in vertex program parser
2013-10-06 20:06:53 +02:00
kervala
88b2a1a38d
Fixed: Use multiarch library path under Linux
2013-09-30 09:11:35 +02:00
kervala
2becb762f8
Fixed: Some warnings
2013-09-29 16:26:24 +02:00
kervala
713e7b75b3
Changed: Detect Windows 8 and Windows Server 2012
2013-09-29 13:41:42 +02:00
kervala
be6a77e9de
Fixed: Compilation under Linux
2013-09-28 10:18:35 +02:00
kervala
6b9e9b8486
Changed: Include Lua headers directory for GUI Editor
2013-09-27 16:43:02 +02:00
kervala
9889049239
Fixed: Some warnings
2013-09-27 16:30:55 +02:00
kaetemi
185709734d
Fix warnings
2013-09-27 01:32:01 +02:00
kaetemi
3d53e078a5
Fix line endings
2013-09-27 00:08:49 +02:00
kervala
b5c625f261
Changed: Created NELID macro to fix warning "multi-character character constant"
2013-09-24 21:33:59 +02:00
Quitta
3d7a7dc191
Merge with quitta-gsoc-2013
2013-09-23 00:49:16 +02:00
kervala
4b6ca1e628
Fixed: Wrong variable used to compute array length
2013-09-22 13:23:03 +02:00
kervala
4f1897208c
Fixed: OpenGL ES driver compilation
2013-09-22 13:20:53 +02:00
kervala
26370c962d
Fixed: Warnings with GCC
2013-09-22 13:20:19 +02:00
kervala
df8c6e9b08
Changed: Created NELID macro to fix warning "multi-character character constant"
2013-09-22 13:10:57 +02:00
kaetemi
64d8faddd0
Fix typo
2013-09-14 19:05:54 +02:00
kaetemi
adcb3e032b
Fix regression from stereo branch in wind tree
2013-09-14 18:58:23 +02:00
kaetemi
60cd1f6116
Fix compile error in vertex program
2013-09-14 17:53:47 +02:00
kaetemi
4adbfd4e4e
Update supportVertexProgram calls
2013-09-14 16:43:36 +02:00
kaetemi
7967709e0e
Remove old interface
2013-09-14 16:45:00 +02:00
kaetemi
102f0080af
Cleanup unused code
2013-09-14 16:23:11 +02:00
kaetemi
0386673d13
Rename
2013-09-14 00:46:10 +02:00
kaetemi
08f37643b7
Cleanup
2013-09-14 00:36:06 +02:00
kaetemi
93b5536036
Merge with default
2013-09-13 23:24:13 +02:00
kaetemi
4f193231a1
Fix compile errors caused by missing includes
2013-09-13 23:23:19 +02:00
kaetemi
7d0a84b2d1
Merge with default
2013-09-13 23:07:49 +02:00
kaetemi
291c5d6012
Cleanup
2013-09-13 23:02:35 +02:00
kaetemi
881949a5d7
Use named indices with wind tree program
2013-09-13 22:20:52 +02:00
kaetemi
7176cbc0af
Use named indices for per pixel light vertex program
2013-09-13 21:47:42 +02:00
kaetemi
edec14807f
Use named uniform indices for lighted vertex program
2013-09-13 21:31:47 +02:00
kaetemi
a0fbb152ee
Updated wind tree program container
2013-09-13 20:45:06 +02:00
kaetemi
ba945f30a8
Use lighted vertex program container for per pixel light program
2013-09-13 20:00:20 +02:00
kaetemi
482c13fd1a
Add container for lighted vertex program
2013-09-13 19:03:05 +02:00
kaetemi
f7e80187ad
Adjust order for meshvp
2013-09-13 18:25:52 +02:00
kaetemi
ce7357ffa4
Do not use old interface here
2013-09-13 17:17:11 +02:00
kaetemi
7d854d54d1
Modify calls in bloom effect
2013-09-13 17:11:42 +02:00
kaetemi
2f384d9789
Update veget implementation
2013-09-13 17:09:05 +02:00
kaetemi
2ee6843cd9
Fixes for d3d
2013-09-13 17:08:56 +02:00
kaetemi
b77101cdd4
Update d3d implementation and add some debugging code
2013-09-11 01:12:37 +02:00
kaetemi
f0177268b4
Rename of a d3d specific class
2013-09-10 19:53:41 +02:00
kaetemi
a798aecd71
Partial update of veget vp
2013-09-10 19:52:14 +02:00
kaetemi
776f198df3
Update some test code
2013-09-10 16:42:51 +02:00
kaetemi
7462d731f1
Small adjustment to landscape vp parameter setting
2013-09-10 16:24:45 +02:00
kaetemi
26f4073ad7
Simplify
2013-09-10 15:59:31 +02:00
kaetemi
4de5eeb586
Adjust landscape vertex program to use new interface
2013-09-10 15:42:42 +02:00
kaetemi
32288eabe8
Use new program interface for water vertex program
2013-09-10 02:07:16 +02:00
kaetemi
dd490a0cc4
Set driver parameters
2013-09-10 02:01:57 +02:00
kaetemi
c9a2f9dbfc
Some fixes
2013-09-10 01:29:53 +02:00
kaetemi
680f260803
Use CSmartPtr for vertex program
2013-09-10 00:31:26 +02:00
kaetemi
14026e6f08
Set params from storage
2013-09-09 23:39:18 +02:00
kaetemi
f46ef4fd07
Fix incorrectly removed line
2013-09-09 23:03:52 +02:00
kaetemi
b6fde3c706
Missed file in last commit
2013-09-09 23:01:43 +02:00
kaetemi
1447e2f2d8
Replace temporary CMaterial code
2013-09-09 21:44:14 +02:00
kaetemi
01577f9f95
Implement param storage copy
2013-09-09 21:05:12 +02:00
kaetemi
aa85673b3b
Flag some TODO's
2013-09-09 20:55:23 +02:00
kaetemi
0bcb0d6ffd
Add glsl pixel program for stereo distortion
2013-09-09 20:49:59 +02:00
kaetemi
057eab4680
Cleanup abstract gpu program interface
2013-09-09 18:33:38 +02:00
kaetemi
fcb0ee720e
Implement new driver interface in Direct3D driver
2013-09-09 16:36:29 +02:00
kaetemi
99a48d5511
Implement new driver interface in OpenGL driver
2013-09-09 14:43:10 +02:00
kaetemi
ea25e5375d
Expand parameter interface
2013-09-09 12:18:20 +02:00
kaetemi
0cf5dbab8a
Reduce function duplication
2013-09-09 02:03:40 +02:00
kaetemi
060bd3035e
Builtin parameter set functions
2013-09-09 01:53:02 +02:00
kaetemi
c512dfbb3d
Separate count and size
2013-09-09 01:31:15 +02:00
kaetemi
7be6891bd7
Cleanup driver interface
2013-09-08 21:57:27 +02:00
kervala
7f6959ce39
Changed: lua, luabind, libwww and libxml2 already linked to previous libraries (NLMISC and NLGUI)
2013-09-08 12:57:34 +02:00
kervala
a023ab89d7
Changed: Updated Freetype libraries variable
2013-09-08 12:54:05 +02:00
kervala
811dca71ee
Changed: Moved lua, luabind and curl FIND_PACKAGE in root CMakeLists.txt
2013-09-08 12:52:00 +02:00
kaetemi
48493b225d
Add additional set functions
2013-09-08 01:49:34 +02:00
kaetemi
58a8982ba5
Add gpu program params storage structure
2013-09-08 01:36:01 +02:00
kaetemi
f4d05d25c5
Implement new gpu program interface in direct3d driver
2013-09-07 22:00:07 +02:00
kaetemi
f4fccab548
Implement new gpu program interface in opengl driver
2013-09-07 21:30:40 +02:00
kaetemi
47716d7247
Make gpu programs use abstract gpu program class
2013-09-07 20:41:07 +02:00
kaetemi
d54774f978
Add abstract gpu program and source classes
2013-09-07 18:33:18 +02:00
kaetemi
ddbb65bd34
Fix compile error
2013-09-07 16:05:28 +02:00
kervala
8d27acc654
Changed: Minor changes
2013-09-06 15:00:35 +02:00
kervala
712f9ad2a0
Fixed: Integer 32 bits conversion to 64 bits pointer
2013-09-06 14:51:21 +02:00