dfighter1985
|
7a4d9e2cdc
|
Merged the gui-editor branch.
--HG--
branch : dfighter-tools
|
2014-09-17 21:12:14 +02:00 |
|
kaetemi
|
adb717052a
|
Add cartographer
--HG--
branch : develop
|
2014-09-14 16:37:24 +02:00 |
|
kaetemi
|
b5a95d725b
|
Add pz process
--HG--
branch : develop
|
2014-09-14 15:02:44 +02:00 |
|
kaetemi
|
d12ccf194e
|
Merge with develop
--HG--
branch : multipass-stereo
|
2014-09-12 15:19:12 +02:00 |
|
kaetemi
|
e347b2a97f
|
ryzomcore/v0.10.0
|
2014-09-12 10:57:31 +02:00 |
|
kaetemi
|
9fd8338849
|
Add data_common to executables_dev batch
|
2014-09-12 10:50:19 +02:00 |
|
kaetemi
|
0d7c9fd4bf
|
When in Rome, do as the Romans do
|
2014-09-11 10:36:41 +02:00 |
|
dfighter1985
|
1ca2b634ee
|
Merged default.
--HG--
branch : dfighter-tools
|
2014-09-10 20:18:00 +02:00 |
|
kaetemi
|
fceb2927f4
|
Add script for installing worldedit data
|
2014-09-10 16:38:19 +02:00 |
|
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 |
|