kaetemi
d03c2dcfcd
Nice try
2014-09-10 16:00:13 +02:00
dfighter1985
46e3242557
Merged default.
...
--HG--
branch : dfighter-tools
2014-09-05 22:28:11 +02:00
dfighter1985
ff0df2bf50
Added support for manipulating atoms.
...
--HG--
branch : dfighter-tools
2014-09-05 20:28:43 +02:00
kervala
ff370bb49f
Changed: Code formatting
2014-09-05 15:42:53 +02:00
dfighter1985
c51b519845
Implemented add and remove buttons.
...
--HG--
branch : dfighter-tools
2014-09-02 19:26:02 +02:00
dfighter1985
f1a6a8d9cd
Apply changes.
...
--HG--
branch : dfighter-tools
2014-09-02 14:54:07 +02:00
kervala
f57380f19b
Changed: Including malloc/malloc.h is useless
2014-08-27 11:21:47 +02:00
kervala
bb324e80b4
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
8d3ea38ffc
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
573fb44088
Link group_wheel.cpp, ref #176
2014-08-25 14:56:29 +02:00
kaetemi
da5558d50a
Merge with default
...
--HG--
branch : multipass-stereo
2014-08-19 15:43:49 +02:00
dfighter1985
a810b29ec7
Merged default.
...
--HG--
branch : gsoc2014-dfighter
2014-08-19 00:33:03 +02:00
kaetemi
683a0adc60
Crashfix in case pacs_prim are exported into .ig
2014-08-18 20:23:27 +02:00
kaetemi
0e0de8ec52
Fix shape lightmap optimize
2014-08-17 19:40:43 +02:00
kaetemi
9a19f2041b
Crashfix in case pacs_prim are exported into .ig
2014-08-17 19:37:20 +02:00
kaetemi
d4b7a3cf8a
Crashfix in case pacs_prim are exported into .ig
2014-08-17 16:48:51 +02:00
kaetemi
8f7931d6a8
Crashfix in case pacs_prim are exported into .ig
2014-08-17 16:41:09 +02:00
kaetemi
e0e1953f41
Crashfix in case pacs_prim are exported into .ig
2014-08-17 16:22:56 +02:00
kervala
e811ff77b1
Merge
2014-08-17 16:08:25 +02:00
kervala
31e9934ba7
Changed #172 XML floating point serialization not using neutral culture
2014-08-17 16:05:51 +02:00
kaetemi
104d6d587a
Additional fix #172 set _Locale to NULL after release
2014-08-17 16:02:51 +02:00
kaetemi
75e2841519
Fix continent path bug
2014-08-17 15:58:42 +02:00
kervala
41f6e70dc9
Fixed #172 XML floating point serialization not using neutral culture
2014-08-17 15:39:30 +02:00
kaetemi
772245a3e6
Merge with default
...
--HG--
branch : multipass-stereo
2014-08-16 15:05:32 +02:00
kaetemi
5bc60987be
Maxscript selection clear fix
2014-08-16 14:51:29 +02:00
kaetemi
f718380f52
Zone light exporter adjust
2014-08-16 14:51:29 +02:00
kaetemi
38abf2193f
Project client loading screens into 3D space for HMD
...
--HG--
branch : multipass-stereo
2014-08-07 18:49:05 +02:00
kaetemi
38a418503d
Non-functional direct to rift
...
--HG--
branch : multipass-stereo
2014-08-07 05:09:11 +02:00
kaetemi
aff0cab54e
GL: Fix switch from different resolution fullscreen to borderless display
...
--HG--
branch : multipass-stereo
2014-08-07 04:45:14 +02:00
kaetemi
e2bfb5d542
Clean handling of display mode switching in client
...
--HG--
branch : multipass-stereo
2014-08-07 04:36:51 +02:00
kaetemi
400f479fe1
GL: Handle borderless fullscreen to specified monitor internally
...
--HG--
branch : multipass-stereo
2014-08-07 04:18:17 +02:00
kaetemi
7c39f7d33b
Specify monitor when changing display mode
...
--HG--
branch : multipass-stereo
2014-08-07 01:04:58 +02:00
dfighter1985
0f7e1c022a
Merge default
...
--HG--
branch : gsoc2014-dfighter
2014-08-07 00:03:09 +02:00
kaetemi
4e33e5cf2f
Process some scene traversals only once when rendering in stereo
...
--HG--
branch : multipass-stereo
2014-08-06 14:36:09 +02:00
kaetemi
e8a245a133
OVR: Chroma factor
...
--HG--
branch : multipass-stereo
2014-08-05 20:14:58 +02:00
kaetemi
e61eb57fd9
OVR: Fix for debug devices
...
--HG--
branch : multipass-stereo
2014-08-05 04:03:27 +02:00
kaetemi
3fd358d69d
OVR: Convert texture coordinates and setup rendering material
...
--HG--
branch : multipass-stereo
2014-08-05 03:54:19 +02:00
kaetemi
102d3653d7
3D: Ensure correct fog handling for effects
...
--HG--
branch : multipass-stereo
2014-08-05 02:58:55 +02:00
dfighter1985
d21aa2b678
Tile loading more or less works. TODO: investigate why displacement map lookup causes crashes.
...
--HG--
branch : gsoc2014-dfighter
2014-08-05 02:58:31 +02:00
kaetemi
6ad1d14617
OVR: Test distortion mesh
...
--HG--
branch : multipass-stereo
2014-08-05 02:55:26 +02:00
kaetemi
65578ce498
OVR: Test large render target
...
--HG--
branch : multipass-stereo
2014-08-05 02:25:14 +02:00
kaetemi
2fbf1cb06d
3D: Set matrix modes after changing render target in effect
...
--HG--
branch : multipass-stereo
2014-08-05 02:24:11 +02:00
kaetemi
339c8b8dfa
3D: Render target matrix context fix
...
--HG--
branch : multipass-stereo
2014-08-05 02:21:30 +02:00
kaetemi
33235bdf6c
OVR: Testing
...
--HG--
branch : multipass-stereo
2014-08-05 01:49:45 +02:00
kaetemi
2e6893fd48
OVR: Translate camera
...
--HG--
branch : multipass-stereo
2014-08-05 00:51:53 +02:00
kaetemi
9b79a44f8a
OVR: Get orientation
...
--HG--
branch : multipass-stereo
2014-08-05 00:46:04 +02:00
kaetemi
262c1f84a9
OVR: Generate distortion mesh
...
--HG--
branch : multipass-stereo
2014-08-05 00:20:21 +02:00
kaetemi
99ea2c685c
OVR: Read device descriptions
...
--HG--
branch : multipass-stereo
2014-08-04 20:32:31 +02:00
kaetemi
f2274d2378
OVR: Iterate devices
...
--HG--
branch : multipass-stereo
2014-08-04 19:19:15 +02:00
kaetemi
b9e10fca72
Cleanup
...
--HG--
branch : multipass-stereo
2014-08-04 18:31:31 +02:00
kaetemi
0488b706b2
Add placeholders for LibOVR 0.4.0 support
...
--HG--
branch : multipass-stereo
2014-08-04 18:30:25 +02:00
kaetemi
96bd17ae63
3D: Fix texture coords for FXAA on D3D
...
--HG--
branch : multipass-stereo
2014-08-04 07:38:40 +02:00
kaetemi
d56047bde6
Remove debug
...
--HG--
branch : multipass-stereo
2014-08-04 06:19:03 +02:00
kaetemi
8a283ea518
3D: User higher quality FXAA version
...
--HG--
branch : multipass-stereo
2014-08-04 06:11:47 +02:00
kaetemi
ec4762f669
3D: Add FXAA
...
--HG--
branch : multipass-stereo
2014-08-04 04:44:27 +02:00
kaetemi
f59de199cf
Fix crash on AMD with legacy clouds
...
--HG--
branch : multipass-stereo
2014-08-04 01:05:53 +02:00
kaetemi
d98f1ede47
Move default render target handling to CDriverUser
...
--HG--
branch : multipass-stereo
2014-08-04 00:57:43 +02:00
kaetemi
e88dedf00c
Adjust render target handling for effects
...
--HG--
branch : multipass-stereo
2014-08-03 22:15:44 +02:00
kaetemi
6c3bcc2439
Merge with default
...
--HG--
branch : multipass-stereo
2014-08-03 22:15:39 +02:00
kaetemi
1c67d6ec0f
GL: Occlusion query bugfix
2014-08-03 22:15:12 +02:00
dfighter1985
30bae94ac3
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.
...
--HG--
branch : gsoc2014-dfighter
2014-08-03 21:33:13 +02:00
kaetemi
6a21d0503c
3D: Cleanup bloom effect
...
--HG--
branch : multipass-stereo
2014-08-03 21:09:55 +02:00
kaetemi
8af686f7ef
3D: Cleanup bloom effect
...
--HG--
branch : multipass-stereo
2014-08-03 20:35:05 +02:00
kaetemi
78ce8f4f25
GL: Share depth and stencil to get similar behaviour to D3D driver
...
--HG--
branch : multipass-stereo
2014-08-03 18:59:19 +02:00
kaetemi
503292065c
Simplify GUI projection settings
...
--HG--
branch : multipass-stereo
2014-08-03 00:56:26 +02:00
kaetemi
1965d46dce
Off-center GUI cylinder
...
--HG--
branch : multipass-stereo
2014-08-02 20:11:28 +02:00
kaetemi
f2dd6083fa
Cylindrical GUI
...
--HG--
branch : multipass-stereo
2014-08-02 19:50:26 +02:00
kervala
7aedffce9a
Changed: #172 XML floating point serialization not using neutral culture (for VC++ 2005 and up)
2014-08-02 11:18:24 +02:00
kervala
b71ec9e7d4
Fixed: build_interface currently only works with 32 bits bitmaps
2014-08-02 10:58:50 +02:00
kervala
ffb7df28ff
Fixed: VC++ 2010 compiler bug in for loop variables reuse
2014-08-02 10:57:31 +02:00
kervala
a29f525c99
Fixed: Some NeL tools in 3d directory don't need NeL 3D
2014-08-01 17:17:53 +02:00
kervala
9aabaebc38
Fixed: Compilation of PACS tools without NeL 3D
2014-08-01 17:00:08 +02:00
kaetemi
c11706feb8
Project GUI into space
...
--HG--
branch : multipass-stereo
2014-08-01 15:44:12 +02:00
kaetemi
f32c3bf6b0
Temporary crashfix, ref #68
...
--HG--
branch : multipass-stereo
2014-08-01 15:23:13 +02:00
kaetemi
caefb04928
Restore camera and scene viewport after disabling VR
...
--HG--
branch : multipass-stereo
2014-08-01 13:20:55 +02:00
kaetemi
c70d8597b2
Merge with default
...
--HG--
branch : multipass-stereo
2014-08-01 11:50:40 +02:00
kaetemi
79c6f50054
Render target format (for alpha)
...
--HG--
branch : multipass-stereo
2014-07-31 18:25:50 +02:00
kaetemi
61f97fae40
Fix issue with render target in OpenGL when size not specified
...
--HG--
branch : multipass-stereo
2014-07-31 17:41:56 +02:00
kaetemi
22d03c5f79
Mode2D selection
...
--HG--
branch : multipass-stereo
2014-07-31 03:53:38 +02:00
kaetemi
dac5b2d274
Merge with game-device
...
--HG--
branch : multipass-stereo
2014-07-31 02:07:20 +02:00
kaetemi
b1e2b60381
Add render target manager, issue #47
...
--HG--
branch : multipass-stereo
2014-07-31 00:46:00 +02:00
kaetemi
8d8d340968
Bugfix
2014-07-30 21:47:48 +02:00
kaetemi
1cf184c09d
Fix XRef ligo export
2014-07-30 20:56:28 +02:00
kaetemi
e58df5f7e9
Faster ligo export step
2014-07-30 20:56:28 +02:00
kaetemi
c8dcfe8d05
Crashfix for 3ds Max export
2014-07-30 20:56:28 +02:00
dfighter1985
431178321f
TileBank loading.
...
--HG--
branch : gsoc2014-dfighter
2014-07-30 10:54:08 +02:00
kaetemi
8e7a3b27d7
ryzomcore/v0.9.1
2014-07-29 19:21:25 +02:00
kaetemi
c461502dc7
Crash workaround in IG loading, ref #171
2014-07-31 19:50:25 +02:00
kaetemi
9061eb8389
Cleanup
2014-07-29 16:48:14 +02:00
kaetemi
f49e9c5df1
Fix Skin export interface issue, #169
2014-07-29 15:42:11 +02:00
kaetemi
a9e3804011
Add warning
2014-07-29 15:23:51 +02:00
kaetemi
7d8e803f7a
Crashfix Physique export
2014-07-29 15:23:06 +02:00
kaetemi
6b0d468240
Remove a debug assert
2014-07-29 14:39:07 +02:00
kaetemi
9f19ade30c
Bugfix
2014-07-29 14:25:28 +02:00
kaetemi
2b8e006981
Initialize object viewer viewport at correct size
2014-07-29 14:10:40 +02:00
kaetemi
617d1235d1
Compile fix
2014-07-29 14:09:08 +02:00
dfighter1985
8373118c7e
Merged default.
...
--HG--
branch : gsoc2014-dfighter
2014-07-22 00:15:50 +02:00
kervala
9b600a154d
Fixed: Initialization of pointers in constructor
2014-07-19 14:02:43 +02:00
kervala
4b39f9640d
Changed: Minor optimization and warning
2014-07-19 14:01:44 +02:00
kervala
0bb464411b
Changed: Replaced tests with .size() by .empty() because faster
2014-07-19 14:01:03 +02:00
kervala
23b73eff1d
Changed: Minor change
2014-07-19 11:24:07 +02:00
kervala
3fb0dfe0c2
Changed: Some Big endian swaps (for PowerPC especially)
2014-07-19 11:23:49 +02:00
kervala
c1ea3820d5
Fixed: Warning
2014-07-19 11:16:43 +02:00
kervala
8d2db7bc85
Changed: Replaced atof by NLMISC::fromString
2014-07-19 11:14:38 +02:00
KISHAN GRIMOUT
b9dc8ace7e
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
12aa02585f
Fix self illumination color widget in NeL Material script
2014-07-28 18:32:05 +02:00
kaetemi
3b4e1a32cb
Fix NeL Material script defaults, fix #166
2014-07-28 18:31:40 +02:00
kaetemi
6e3827928b
Adjust 3ds Max plugin versioning info
2014-07-28 18:31:20 +02:00
kaetemi
176c3d8a4a
Add callback template class
...
--HG--
branch : develop
2014-07-12 18:19:25 +02:00
kaetemi
7487ea4135
Higher quality outline, visual difference is relevant only for black
...
--HG--
branch : develop
2014-10-16 02:00:45 +02:00
Laszlo Kis-Adam
03af2ed463
Merged in dfighter1985/ryzomcore/dfighter-tools (pull request #94 )
...
Just too lazy to push directly
--HG--
branch : develop
2014-10-15 19:48:23 +02:00
kaetemi
b010f224e4
Don't use I18N when the required ui prefix is not in the tooltip text (convention actually dictates uitt as tooltip prefix)
...
--HG--
branch : develop
2014-10-14 23:45:08 +02:00
kaetemi
07a57f81f8
Shadow should not be taken into account for font height, breaks vertical centering
...
--HG--
branch : develop
2014-10-14 23:45:08 +02:00
kaetemi
496f7f268c
Trash DirectInput
...
--HG--
branch : game-device
2014-07-12 17:17:24 +02:00
dfighter1985
012ad96806
Texture chooser now supports atlas textures as well.
...
--HG--
branch : gsoc2014-dfighter
2014-07-09 21:07:12 +02:00
kaetemi
e729a9d035
Fix #162 : Center ingame mouse cursor after login
2014-07-09 12:31:22 +02:00
kaetemi
246d931bee
Formatting: Use tabs
2014-07-09 16:59:55 +02:00
KISHAN GRIMOUT
107646d95d
fix windows 64bit build in mem_displayer.cpp
2014-07-09 13:41:43 +02:00
kaetemi
f281622d47
Trash DirectInput
...
--HG--
branch : game-device
2014-07-08 22:21:11 +02:00
dfighter1985
fe58435bb5
CPath can now return the file list with a path filter.
...
--HG--
branch : gsoc2014-dfighter
2014-07-06 23:21:25 +02:00
dfighter1985
085c1b41b9
Added facilities for viewing the loaded actions.
...
--HG--
branch : gsoc2014-dfighter
2014-07-02 22:27:04 +02:00
dfighter1985
27fe95904a
Quelled some compiler compliants.
...
--HG--
branch : gsoc2014-dfighter
2014-06-29 03:01:43 +02:00
dfighter1985
7f5973e462
tooltip parent is now changable using an enum.
...
--HG--
branch : gsoc2014-dfighter
2014-06-29 02:53:33 +02:00
dfighter1985
842ca366de
Tooltip posrefs are now enums in the GUI Editor.
...
--HG--
branch : gsoc2014-dfighter
2014-06-29 01:44:06 +02:00
dfighter1985
e182e25e07
text posref is now an enum too.
...
--HG--
branch : gsoc2014-dfighter
2014-06-27 00:07:44 +02:00
dfighter1985
250cd6efc1
Posref can now be set as an enum, instead of a string in the property editor.
...
--HG--
branch : gsoc2014-dfighter
2014-06-21 18:25:14 +02:00
kaetemi
353c74ff21
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
5cb8a7700e
Exit with error
2014-06-21 05:46:20 +02:00
kaetemi
cf3e779ae9
Fix compile
2014-06-20 23:38:44 +02:00
kaetemi
655c22e839
Fix compile
2014-06-20 23:24:54 +02:00
kaetemi
07dd9eb85b
Compile fix
2014-06-20 17:53:38 +02:00
kaetemi
43a061bebd
SSE2: Compile fix
...
--HG--
branch : sse2
2014-06-20 03:08:51 +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
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
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
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
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
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
kaetemi
0d67c420cd
Set exec mode
2014-05-23 22:39:50 +02:00
kaetemi
4311da091f
Add --admininstall parameter to c1_shard_patch
2014-05-23 17:25:52 +02:00
kaetemi
0a41e6b3c4
Fix Windows compilation of lightmap_optimizer
2014-05-23 01:57:19 +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
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
e84dd7b5f7
Changed: Replaced strlwr by toLower
2014-04-24 22:59:29 +02:00
kervala
24fa8df5ff
Fusion avec default
...
--HG--
branch : compatibility
2014-04-24 19:16:42 +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
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
dfighter1985
4abf74d6e9
We can now drag elements, they will disappear and whatnot, but at least they can be dragged!
...
--HG--
branch : gui-editor
2014-04-21 19:30:33 +02:00
dfighter1985
e12d189d51
Refactored input event handling a bit.
...
--HG--
branch : gui-editor
2014-04-20 21:41:57 +02: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
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
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
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
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
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
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
2076a6b13d
Changed: Typo
2014-03-22 16:23:28 +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
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
020bfb775e
Disable build of dataset packed sheets in build pipeline
2014-02-20 20:15:18 +01:00
kaetemi
72fac9aaf1
Update default directories
2014-02-20 03:37:23 +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
76ce7523ff
Additional streaming behaviour fix for XAudio2 driver
2014-02-17 00:20:29 +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
kaetemi
6426393210
Additional streaming behaviour fix for XAudio2 driver
...
--HG--
branch : compatibility
2014-02-17 00:20:29 +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
kaetemi
5c4175a54d
Only copy if needed
2014-02-14 02:46:07 +01:00
kaetemi
74363fdb33
Merge
2014-02-14 02:38:53 +01:00
kaetemi
e569541faa
Fix default directory
2014-02-14 02:03:22 +01:00
kaetemi
497232b470
Extend shard data script to gather executables and configurations
2014-02-14 01:21:05 +01:00
kaetemi
3267b89362
Add directories for patchman to gamedata setup
2014-02-14 01:01:02 +01:00
kaetemi
9939219ebf
Extend shard data script
2014-02-13 22:02:25 +01:00
botanic
2e1b47e3f0
Backed out merge changeset: b2d97621fa3b
...
Backed out merge revision to its first parent (99840e8413f2)
2014-02-13 12:12:28 -08:00
kervala
6b04b77bdd
Fixed: Reverted i18n change
...
--HG--
branch : compatibility
2014-02-13 14:17:32 +01:00
kaetemi
f4dda130a6
Clean translation diffs from OLDVALUE comments before merge, issue #116 , patch provided by Łukasz K
2014-02-12 16:35:07 +01:00
kaetemi
4df290147b
Fix make_merge_wk for uxt
2014-02-10 16:38:04 +01:00
kaetemi
b1c485fde0
Cleanup
2014-02-09 22:35:01 +01:00
kaetemi
451a82e59e
Cleanup
2014-02-09 22:21:30 +01:00
kaetemi
ccf99f4f8e
Merge
2014-02-09 22:15:33 +01:00
kaetemi
4f2a1b7db2
Fix the bug that caused the shape exporter to crash
2014-02-09 22:12:44 +01:00
kaetemi
90c9028170
Cleanup
2014-02-09 21:53:49 +01:00
kaetemi
ada9e8da5d
Fix export of NeL Flare
2014-02-09 17:26:26 +01:00
Matthew Lagoe
3f04907c31
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
bd206db383
Remove pacs.packed_prims when done
2014-02-09 02:42:45 +01:00
kaetemi
9d5c9019b5
Move visual slot tab to separate directory
2014-02-09 02:40:14 +01:00
kaetemi
13e3849c89
Fix typo
2014-02-08 23:57:39 +01:00
kaetemi
6ac551cf60
Implement skip for rbank process
2014-02-08 23:43:42 +01:00
kaetemi
f085e226c6
Implement skip for ig elevation
2014-02-08 22:54:25 +01:00
kaetemi
bd335d80c4
Implement skip for zone dependency process
2014-02-08 22:23:24 +01:00
kaetemi
3d2c60aac6
Get properties search paths from python variable
2014-02-08 22:07:33 +01:00
kaetemi
af65ca5c62
Fix lightmap optimize skip
2014-02-08 21:09:35 +01:00
kaetemi
38e353b5c6
Implement skip for coarse mesh build process
2014-02-08 21:02:24 +01:00
kaetemi
a0f86ebd39
Implement skip for shape lightmap optimize build process
2014-02-08 20:02:57 +01:00
kaetemi
01a115899b
Implement skip for interface build process
2014-02-08 19:44:52 +01:00
kaetemi
3f492d8b20
Add script to automatically merge translation wk files
2014-02-08 17:36:17 +01:00
kaetemi
6371fc324d
Add script to make and merge all translation diffs
2014-02-08 17:10:34 +01:00
kaetemi
6b19d30de0
Add short translation procedure readme
2014-02-08 17:01:13 +01:00
kaetemi
8dac3b82f3
Merge
2014-02-08 16:26:01 +01:00
kaetemi
74984f768a
Improve leveldesign_dev.bat
2014-02-08 16:24:56 +01:00
botanic
e728daa7cd
Add CMAKE option and NVIDIA PerfHUD support
2014-02-07 19:49:40 -08:00
kaetemi
972d26ddde
Adjust default paths
2014-02-08 01:34:16 +01:00
kaetemi
b785192a5e
Add clause translation tool scripts
2014-02-08 01:03:01 +01:00
kaetemi
762a3b2655
Add translation tool scripts
2014-02-08 00:23:42 +01:00
kaetemi
62a4bec18c
Add translation directory to pipeline setup
2014-02-08 00:03:56 +01:00
kaetemi
50f0ebbb41
Copy refs in client install
2014-02-07 19:35:55 +01:00
kaetemi
ef03dcd294
Add refs to patch xml
2014-02-07 18:30:55 +01:00
kaetemi
9c9811f1b3
Reorder pipeline scripts
2014-02-07 18:10:09 +01:00
kaetemi
7736c5757c
Add world edit data install directory to pipeline setup
2014-02-07 18:04:23 +01:00
kaetemi
f3b6ab7052
Typo
2014-02-07 17:23:34 +01:00
kaetemi
0d0907aa08
Add build shadow skin to shape process
2014-02-07 17:16:40 +01:00
kaetemi
3fa19d91a5
Generate correct client.cfg data path for dev client
2014-02-07 15:26:15 +01:00
kaetemi
2619033972
Replace shard install script
2014-02-07 14:53:47 +01:00
kaetemi
680dfbd738
Remove duplicate tool
...
--HG--
branch : build_pipeline_py
2014-02-07 02:17:42 +01:00
kaetemi
40fe633dbe
Fix thread lockup in zone lighter
...
--HG--
branch : build_pipeline_py
2014-02-07 02:01:23 +01:00
kaetemi
5144770d9d
Backed out changeset: de1de16eef3b
...
--HG--
branch : build_pipeline_py
2014-02-07 01:49:39 +01:00
kaetemi
7219073bdc
Include world editor files directory in prim export
...
--HG--
branch : build_pipeline_py
2014-02-07 01:49:16 +01:00
kaetemi
1a0ee41780
Improve debug message
...
--HG--
branch : build_pipeline_py
2014-02-07 01:49:01 +01:00
kaetemi
31d5b54e74
Let prim checker only open files with ig extension
...
--HG--
branch : build_pipeline_py
2014-02-07 01:01:36 +01:00
kaetemi
240576ab9c
Add primitives directory to rbank lookup (needed file_index.cfg - is this the correct primitives dir?)
...
--HG--
branch : build_pipeline_py
2014-02-07 01:01:19 +01:00
kaetemi
f5c30593c8
Merge with default
...
--HG--
branch : build_pipeline_py
2014-02-07 00:11:12 +01:00
kaetemi
2c4ca0d915
Include world editor files in rbank process, part of what caused water not to build
...
--HG--
branch : build_pipeline_py
2014-02-06 23:58:18 +01:00
kaetemi
32ca8d61fe
Add more paths to the build gamedata configuration
...
--HG--
branch : build_pipeline_py
2014-02-06 23:49:54 +01:00
kaetemi
439ba0713e
Build pacs prim list txt outside repository
...
--HG--
branch : build_pipeline_py
2014-02-06 22:10:56 +01:00
kaetemi
dfb2815bcd
Add separate target directory for shard data
...
--HG--
branch : build_pipeline_py
2014-02-06 21:44:14 +01:00
kaetemi
6f7e5e7c72
Update default paths
...
--HG--
branch : build_pipeline_py
2014-02-06 20:31:43 +01:00
kaetemi
11c9f6a91b
Merge with default
...
--HG--
branch : build_pipeline_py
2014-02-06 20:16:18 +01:00
kaetemi
48d2c22639
Merge with default
...
--HG--
branch : kaetemi-cleanup
2014-02-06 19:54:15 +01:00
kaetemi
89a2a2ce99
Do not select stereo display debugger when HMD is set to Auto in Snowballs
2014-02-04 20:52:15 +01:00
kaetemi
ca31e78f7c
Remove georges4cvs feature
2014-02-03 01:25:02 +01:00
kaetemi
bcb2f48940
Remove georges4cvs feature
2014-02-03 00:16:35 +01:00
kervala
c9a9839ce6
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
1c50b1f943
Fixed: Compilation under Mac OS X 10.9
2014-01-30 14:43:51 +01:00
botanic
e995784886
Fixed typo issue 60
2014-01-28 11:41:26 -08:00
botanic
71b0f9ae92
Issue #60
...
does seem to work better when latency is high
2014-01-26 03:20:00 -08:00
botanic
60495f79ac
Merge
2014-01-26 02:58:42 -08:00
botanic
b6441edf2d
Fix for Issue #94
2014-01-26 02:57:59 -08:00
kervala
a5a9532a13
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
16dbe48ed5
use NEL CFile function for file test
...
--HG--
branch : lightmap_optimizer_port_to_linux
2014-01-25 17:09:07 +01:00
liria
a6d9521ae6
Merged default into lightmap_optimizer_port_to_linux
...
--HG--
branch : lightmap_optimizer_port_to_linux
2014-01-25 13:52:12 +01:00
liria
54c53255b1
make the programm compile on linux plateform
...
--HG--
branch : lightmap_optimizer_port_to_linux
2014-01-25 11:50:14 +01:00
kervala
09e3471f1b
Fixed: Compilation with freetype
2014-01-25 10:45:57 +01:00
kervala
43c48ad36a
Changed: Enable ig_elevation everywhere (patch by Liria)
2014-01-23 13:08:11 +01:00
liria
41a475b8f3
Merged default into ig_elevaton_port_to_linux
...
--HG--
branch : ig_elevaton_port_to_linux
2014-01-23 00:49:56 +01:00
liria
ac48221c8b
CMakeLists.txt edited online with Bitbucket - remove merge conflict with default branche
...
--HG--
branch : ig_elevaton_port_to_linux
2014-01-22 23:49:11 +00:00
kaetemi
207d7323ce
Fix Qt build on Windows
2014-01-21 12:50:23 +01:00
Nimetu
ea5a36b105
Remove tooltip debug message from logs
...
--HG--
branch : misc-patches
2014-01-04 00:20:05 +02:00
Nimetu
4c2531474a
Fix typo (issue #70 )
...
--HG--
branch : misc-patches
2014-01-03 19:51:50 +02:00
Nimetu
3cd6ecdb82
Add deadlock counter to prevent endless loop (issue #73 )
...
--HG--
branch : misc-patches
2014-01-03 19:11:49 +02:00
botanic
935ea04c58
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
db3a789ab4
un kaetemi'd the pipeline
2013-12-30 08:59:59 -08:00
botanic
2c0d64e8ff
added single bat file to run whole pipeline
2013-12-29 23:25:09 -08:00
kervala
6196077160
Changed: #85 Compilation with STLport + EOL
2013-11-22 11:25:53 +01:00
kervala
986edb216f
Fixed : #85 Compilation with STLport
2013-11-22 11:25:12 +01:00
kervala
c718ff693a
Fixed: Assign instead of comparison
2013-11-22 11:20:07 +01:00
kervala
b219623129
Fixed: Verbose warning
2013-11-13 22:23:57 +01:00
kervala
b96ad682f5
Fixed: Compilation under Mac OS X
2013-11-13 22:23:24 +01:00
kervala
a45bbd96c5
Fixed: Warning with clang
2013-11-13 22:23:02 +01:00
kervala
af1721a0a4
Changed: Don't need to change _PolygonSmooth if value is the same
2013-11-13 21:55:14 +01:00
kervala
166607f644
Changed: Implement VSync under Mac OS X
2013-11-13 21:54:45 +01:00
kervala
73196fe7fe
Changed: Replace strlwr by toLower
2013-11-13 21:53:21 +01:00
kervala
b46c316940
Fixed : #77 crash when using lua:parseInterfaceFromString() (a big thanks to nimetu for the fix !)
2013-11-13 21:52:21 +01:00
kervala
dda2215ed8
Fixed: Wrong algorithm
2013-11-13 21:46:42 +01:00
kervala
6b3b85962a
Changed: EOL
2013-11-13 21:45:06 +01:00
kervala
d8a6c9f966
Fixed: Warning with clang
2013-11-13 21:40:41 +01:00
kervala
36a537a88e
Changed: Replaced atof by fromString
2013-11-13 21:37:28 +01:00
kervala
b7082644f0
Changed: Updated OpenGL registry
2013-11-13 20:31:08 +01:00
Botanic
6dfafa7ae1
Merge
2013-11-02 16:35:26 -07:00
sfb
59abfb8a1d
Bad logging, content is unsigned const char*, fixed it to use %s and not cast.
...
--HG--
branch : gsoc2011-worldeditorqt
2013-10-28 12:58:08 -05:00
sfb
df7110d2d6
Bad merge resolution, fixed a couple source files which merged poorly.
...
--HG--
branch : gsoc2011-worldeditorqt
2013-10-28 11:24:31 -05:00
sfb
d86f150caa
Bad merge resolution, fixed the build files that merged poorly.
...
--HG--
branch : gsoc2011-worldeditorqt
2013-10-28 11:24:02 -05:00
Botanic
7381de073e
fixed bad merge
2013-10-26 00:57:50 -07:00
Botanic
057fe3e0f7
Merge
2013-10-26 00:50:56 -07:00
sfb
892ed1ed3d
merge from default
...
--HG--
branch : gsoc2011-worldeditorqt
2013-10-23 12:08:09 -05:00
Matt Raykowski
0001719d99
Merged in DJanssens/quitta-ryzomcore (pull request #25 )
...
Ryzom AMS - GSOC Project
2013-10-19 16:02:52 -05:00
kaetemi
563afd027c
Fix #67 bad NELID in vertex program parser
2013-10-06 20:06:53 +02:00
kervala
eb3c58cce9
Fixed: Use multiarch library path under Linux
2013-09-30 09:11:35 +02:00
kervala
de43ea8d86
Fixed: Some warnings
2013-09-29 16:26:24 +02:00
kervala
f2ee0e99d8
Changed: Detect Windows 8 and Windows Server 2012
2013-09-29 13:41:42 +02:00
kervala
c7899841d3
Fixed: Compilation under Linux
2013-09-28 10:18:35 +02:00
kervala
eebe74066e
Changed: Include Lua headers directory for GUI Editor
2013-09-27 16:43:02 +02:00
kervala
43bbfe3da7
Fixed: Some warnings
2013-09-27 16:30:55 +02:00
kaetemi
3b4730c890
Fix warnings
2013-09-27 01:32:01 +02:00
kaetemi
85365fd7bb
Fix line endings
2013-09-27 00:08:49 +02:00
kervala
c8c296f484
Changed: Created NELID macro to fix warning "multi-character character constant"
2013-09-24 21:33:59 +02:00
Quitta
a484de5b3f
Merge with quitta-gsoc-2013
2013-09-23 00:49:16 +02:00
kervala
bb7297f260
Fixed: Wrong variable used to compute array length
2013-09-22 13:23:03 +02:00
kervala
b7ddc2c0d2
Fixed: OpenGL ES driver compilation
2013-09-22 13:20:53 +02:00
kervala
82904232d2
Fixed: Warnings with GCC
2013-09-22 13:20:19 +02:00
kervala
6695a9064e
Changed: Created NELID macro to fix warning "multi-character character constant"
2013-09-22 13:10:57 +02:00
kaetemi
1a669307da
Fix typo
2013-09-14 19:05:54 +02:00
kaetemi
ce9e0a397b
Fix regression from stereo branch in wind tree
2013-09-14 18:58:23 +02:00
kaetemi
046e3c92da
Fix compile error in vertex program
2013-09-14 17:53:47 +02:00