Commit graph

455 commits

Author SHA1 Message Date
kaetemi
f65a9e835f Specify monitor when changing display mode 2014-08-07 01:04:58 +02:00
dfighter1985
e4abdd69ad Merge default 2014-08-07 00:03:09 +02:00
dfighter1985
c17b8c32ab Add the property browser library to the CPack archive when generated. 2014-08-06 22:59:58 +02:00
dfighter1985
26be5f497c World Editor plugin Linux build fix. 2014-08-06 22:12:46 +02:00
dfighter1985
c1ab55acad GUI Editor Linux build fix 2014-08-06 22:10:11 +02:00
dfighter1985
ecca3ed63e Fixed qrc path. 2014-08-06 19:54:01 +02:00
dfighter1985
8da30e76e6 Update the tile list right away if the image is replaced. 2014-08-06 17:40:39 +02:00
dfighter1985
b313c4baa4 If I add a 256x256 tile, maybe I should remove it as 256x256, not 128x128... 2014-08-06 17:14:59 +02:00
kaetemi
b62024f94c Process some scene traversals only once when rendering in stereo 2014-08-06 14:36:09 +02:00
dfighter1985
6286313877 Statically load the empty tile image so that we don't need to have over 9000 instances of it. Also display an error message if loading fails on startup. 2014-08-06 13:25:50 +02:00
dfighter1985
06dd003836 Removed yet another unused variable. 2014-08-06 13:04:30 +02:00
dfighter1985
ecf461cced Removed unused variable. 2014-08-06 13:01:44 +02:00
kaetemi
eb89fe8da3 OVR: Chroma factor 2014-08-05 20:14:58 +02:00
dfighter1985
8d7d85d440 Repaint immediately when the display channel is changed. 2014-08-05 16:01:45 +02:00
dfighter1985
7c0ea3b9a0 Save the last directory where we loaded a tile image from. 2014-08-05 15:34:29 +02:00
dfighter1985
c3984abbb4 Save the last directoy where we loaded a tilebank from. 2014-08-05 15:16:25 +02:00
dfighter1985
2fe02e3925 Rotation is now set in the tilebank wrapper and applied when replacing a tile. 2014-08-05 13:42:56 +02:00
dfighter1985
99d1d9c4c2 Line endings and copyright headers... 2014-08-05 13:18:41 +02:00
kaetemi
49043f60fa OVR: Fix for debug devices 2014-08-05 04:03:27 +02:00
kaetemi
5220692fe6 OVR: Convert texture coordinates and setup rendering material 2014-08-05 03:54:19 +02:00
dfighter1985
7912cbe7dc Set all images by default. 2014-08-05 03:35:10 +02:00
dfighter1985
066743bea0 Clear before loading the model data. 2014-08-05 03:20:30 +02:00
dfighter1985
1e76cd0f5e Makes no sense, but doesn't seem to be crashing anymore o.O 2014-08-05 03:17:29 +02:00
kaetemi
420df031dc 3D: Ensure correct fog handling for effects 2014-08-05 02:58:55 +02:00
dfighter1985
3e3572c3ab Tile loading more or less works. TODO: investigate why displacement map lookup causes crashes. 2014-08-05 02:58:31 +02:00
kaetemi
95ffae003d OVR: Test distortion mesh 2014-08-05 02:55:26 +02:00
kaetemi
1eb4122cbd OVR: Test large render target 2014-08-05 02:25:14 +02:00
kaetemi
f5c3f3ad45 3D: Set matrix modes after changing render target in effect 2014-08-05 02:24:11 +02:00
kaetemi
318798eeef 3D: Render target matrix context fix 2014-08-05 02:21:30 +02:00
kaetemi
0c6907c995 OVR: Testing 2014-08-05 01:49:45 +02:00
kaetemi
93cd45919e OVR: Translate camera 2014-08-05 00:51:53 +02:00
kaetemi
d699bf9f3c OVR: Get orientation 2014-08-05 00:46:04 +02:00
kaetemi
925a11fc14 OVR: Generate distortion mesh 2014-08-05 00:20:21 +02:00
dfighter1985
4bb8b3373e Saving tilebank 2014-08-04 22:14:39 +02:00
dfighter1985
c4b770a7b6 Texture path. 2014-08-04 21:59:05 +02:00
dfighter1985
a2065bf746 Surface data. 2014-08-04 21:53:22 +02:00
dfighter1985
342cca7751 Oriented stuff. 2014-08-04 21:41:33 +02:00
dfighter1985
2f0acf32cb Vegetation set stuff. 2014-08-04 21:33:11 +02:00
dfighter1985
fa9cd4af24 Most of the functionality works with the new code. 2014-08-04 21:22:44 +02:00
kaetemi
e89e7985ab OVR: Read device descriptions 2014-08-04 20:32:31 +02:00
kaetemi
153856fb34 OVR: Iterate devices 2014-08-04 19:19:15 +02:00
kaetemi
6fc54b3ed1 Cleanup 2014-08-04 18:31:31 +02:00
kaetemi
0835833c9e Add placeholders for LibOVR 0.4.0 support 2014-08-04 18:30:25 +02:00
shubham_meena
dd2b2bbb3d rest api using curl 2014-08-04 14:05:11 +05:30
kaetemi
09222fd4f6 3D: Fix texture coords for FXAA on D3D 2014-08-04 07:38:40 +02:00
kaetemi
8007d2cf5e Add FXAA to Ryzom Client 2014-08-04 06:19:19 +02:00
kaetemi
24a3d1aaad Remove debug 2014-08-04 06:19:03 +02:00
kaetemi
005b0d1b15 3D: User higher quality FXAA version 2014-08-04 06:11:47 +02:00
kaetemi
283363425d Cleanup snowballs2 2014-08-04 05:24:40 +02:00
kaetemi
b9b497fc1f 3D: Add FXAA 2014-08-04 04:44:27 +02:00
kaetemi
2bd1d8a071 Fix crash on AMD with legacy clouds 2014-08-04 01:05:53 +02:00
kaetemi
ba88c3c19f Move default render target handling to CDriverUser 2014-08-04 00:57:43 +02:00
kaetemi
d71f4c28c8 Adjust render target handling for effects 2014-08-03 22:15:44 +02:00
kaetemi
ab606fa7dd Merge with default 2014-08-03 22:15:39 +02:00
kaetemi
f4d83149a7 GL: Occlusion query bugfix 2014-08-03 22:15:12 +02:00
dfighter1985
8d7c974be6 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
ef79c4abed 3D: Cleanup bloom effect 2014-08-03 21:09:55 +02:00
kaetemi
011f340bf9 3D: Cleanup bloom effect 2014-08-03 20:35:05 +02:00
dfighter1985
16791d58c1 Rotation can now be set. 2014-08-03 19:04:34 +02:00
kaetemi
d99645efe0 GL: Share depth and stencil to get similar behaviour to D3D driver 2014-08-03 18:59:19 +02:00
dfighter1985
df07fcb53b Save the tile border, etc data when saving. 2014-08-03 17:58:02 +02:00
dfighter1985
c5acb72c32 Added checks. Yes it's horrible and needs to be refactored. 2014-08-03 04:15:12 +02:00
kaetemi
5b0b668c66 Simplify GUI projection settings 2014-08-03 00:56:26 +02:00
kaetemi
e3b1648833 Off-center GUI cylinder 2014-08-02 20:11:28 +02:00
kaetemi
8d0227cbf3 Cylindrical GUI 2014-08-02 19:50:26 +02:00
kervala
59b1141d37 Changed: #172 XML floating point serialization not using neutral culture (for VC++ 2005 and up) 2014-08-02 11:18:24 +02:00
kervala
f63f7acfbd Fixed: build_interface currently only works with 32 bits bitmaps 2014-08-02 10:58:50 +02:00
kervala
8f7a050a9e Fixed: VC++ 2010 compiler bug in for loop variables reuse 2014-08-02 10:57:31 +02:00
kaetemi
6afd72bd87 Sound orientation with HMD and Headphones 2014-08-01 23:11:35 +02:00
kervala
8356b791d4 Fixed: Some NeL tools in 3d directory don't need NeL 3D 2014-08-01 17:17:53 +02:00
kervala
5cb991c1b0 Fixed: Compilation of PACS tools without NeL 3D 2014-08-01 17:00:08 +02:00
kaetemi
f94c65faa9 Project GUI into space 2014-08-01 15:44:12 +02:00
kaetemi
2d7eb321b0 Temporary crashfix, ref #68 2014-08-01 15:23:13 +02:00
kaetemi
f6483d45ef Restore camera and scene viewport after disabling VR 2014-08-01 13:20:55 +02:00
shubham_meena
5b87381103 API key management calender 2014-08-01 16:01:35 +05:30
kaetemi
ce2de7ec8e Merge with default 2014-08-01 11:50:40 +02:00
dfighter1985
0f2a0f4049 Apply the current zoom factor! 2014-08-01 02:38:04 +02:00
dfighter1985
640f0f6be1 Don't reload the pixmaps every time they are displayed... -.- 2014-08-01 02:34:57 +02:00
dfighter1985
6cfd0b6942 Line endings... 2014-07-31 23:23:52 +02:00
kaetemi
f07994a8d4 Render target format (for alpha) 2014-07-31 18:25:50 +02:00
kaetemi
dade08fd31 Fix issue with render target in OpenGL when size not specified 2014-07-31 17:41:56 +02:00
kaetemi
ac4c9b7fc4 Mode2D selection 2014-07-31 03:53:38 +02:00
kaetemi
5d5674e1fa Merge with game-device 2014-07-31 02:07:20 +02:00
kaetemi
3e44b75220 Add render target manager, issue #47 2014-07-31 00:46:00 +02:00
kaetemi
d0793b2e6b Bugfix 2014-07-30 21:47:48 +02:00
kaetemi
597221ecef Fix XRef ligo export 2014-07-30 20:56:28 +02:00
kaetemi
ca94c90ae6 Faster ligo export step 2014-07-30 20:56:28 +02:00
kaetemi
71d16b0e24 Crashfix for 3ds Max export 2014-07-30 20:56:28 +02:00
dfighter1985
23838b00c4 When hitting 'save as' ask for a filename even if one is set. 2014-07-30 15:55:09 +02:00
dfighter1985
0181dbccf1 Should store the filename after opening.. 2014-07-30 15:44:02 +02:00
dfighter1985
8caeae31c8 Should only add 1 tile here... 2014-07-30 15:40:02 +02:00
dfighter1985
3ad6587d53 128 and 256 tiles don't have alpha, so no need to load/save them. 2014-07-30 15:29:50 +02:00
dfighter1985
7b36ce2e85 Replace and delete image should be applied to the correct channel now. 2014-07-30 14:39:19 +02:00
dfighter1985
67ba567c66 Show the image that belongs to the channel that is selected. 2014-07-30 14:28:17 +02:00
dfighter1985
2c8b513c97 Copyright headers... 2014-07-30 11:20:29 +02:00
dfighter1985
cfb7833b8f Close the loaded file and return true... 2014-07-30 11:15:14 +02:00
dfighter1985
a9fa41cf9a Set teh current selection to row 0 2014-07-30 11:14:41 +02:00
dfighter1985
bb36cb5724 Save and load the tilebank texture path. 2014-07-30 11:10:15 +02:00
dfighter1985
3668784e7a Save and load the veget set filename. 2014-07-30 10:58:37 +02:00
dfighter1985
47b85c3f8a TileBank loading. 2014-07-30 10:54:08 +02:00
dfighter1985
f25200c966 Add the already selected tilesets to the land when editing. 2014-07-30 07:43:02 +02:00
dfighter1985
0582dd4e4f Connected the oriented combobox and now saving it's value to the tilebank. 2014-07-30 01:50:01 +02:00
dfighter1985
1952d517b1 Implemented saving of the currently stored tilebank data. 2014-07-30 01:29:17 +02:00
kaetemi
371b58b0f5 ryzomcore/v0.9.1 2014-07-29 19:21:25 +02:00
kaetemi
5ffea55bcc Crash workaround in IG loading, ref #171 2014-07-31 19:50:25 +02:00
kaetemi
6b6f4fac2f Cleanup 2014-07-29 16:48:14 +02:00
kaetemi
20acc5a48c Fix Skin export interface issue, #169 2014-07-29 15:42:11 +02:00
kaetemi
7d79e75d1a Add warning 2014-07-29 15:23:51 +02:00
kaetemi
00881eed6c Crashfix Physique export 2014-07-29 15:23:06 +02:00
kaetemi
a3b0f16823 Remove a debug assert 2014-07-29 14:39:07 +02:00
kaetemi
5390f976cf Bugfix 2014-07-29 14:25:28 +02:00
kaetemi
e854571ba5 Initialize object viewer viewport at correct size 2014-07-29 14:10:40 +02:00
kaetemi
661d5fd274 Compile fix 2014-07-29 14:09:08 +02:00
nimetu
4f2fcb6808 Crafted tool durability, fix #156 2014-07-28 23:51:25 +02:00
dfighter1985
d85d0b97d3 As it turns out, tilesets can be assigned to multiple lands... 2014-07-28 17:05:51 +02:00
dfighter1985
3fe1101f44 Implemented the GUI part of saving... 2014-07-27 20:38:08 +02:00
dfighter1985
05d8295bb6 128x128 tab should be shown by default. 2014-07-27 18:23:25 +02:00
dfighter1985
4c72aa85cf Implemented tile image replace. 2014-07-26 02:24:32 +02:00
dfighter1985
10f757286b Implemented tile image deletion. 2014-07-26 02:19:13 +02:00
dfighter1985
93fa8d3e3b A little refactoring. 2014-07-26 02:11:02 +02:00
dfighter1985
dd193e3d51 Reindex tile item nodes after deleting a node. 2014-07-26 02:05:21 +02:00
dfighter1985
fc76db29d0 Implemented tile deletion. 2014-07-26 01:57:50 +02:00
dfighter1985
9deb101894 I must be blind... 2014-07-26 00:32:42 +02:00
dfighter1985
299a51edf5 Implemented Tile addition. 2014-07-26 00:29:37 +02:00
shubham_meena
c1f7aa6220 bug fix: added template path option in .info file 2014-07-26 00:27:57 +05:30
dfighter1985
3e44d16242 Implemented tilebank texture path setting. 2014-07-24 23:41:42 +02:00
dfighter1985
f8a826f853 Implemented choosing / resetting vegetset for tile sets. 2014-07-24 23:31:37 +02:00
dfighter1985
93af2ff11f When selecting another land, select the first tile set, if it exists. 2014-07-24 18:44:00 +02:00
dfighter1985
5a0fe4d309 Connect the selection model so the widgets are updated. 2014-07-24 18:39:34 +02:00
dfighter1985
44fd75a05b Each land has it's own TilesetModel now. When changing the land the model also changes. 2014-07-24 18:31:07 +02:00
dfighter1985
18cf4eb473 Implemented land name changing. 2014-07-24 16:25:28 +02:00
dfighter1985
95e27a511c Implemented land removal. 2014-07-24 16:20:44 +02:00
dfighter1985
b2a094cf4f Implemented land adding. 2014-07-24 16:18:01 +02:00
dfighter1985
b0a1149399 Renamed land related widgets. 2014-07-24 16:09:58 +02:00
dfighter1985
9365973fcd Implemented tileset move up and move down. 2014-07-24 02:28:19 +02:00
dfighter1985
df1cf32d0f Implemented tileset rename. 2014-07-23 21:53:09 +02:00
dfighter1985
2f6e34ce17 Implemented tileset removal. 2014-07-23 18:35:26 +02:00
dfighter1985
da3c2603bc Don't try to delete the same items more than once! 2014-07-22 15:38:26 +02:00
dfighter1985
147c5604e0 Don't allow 2 tilesets to have the same name. 2014-07-22 15:35:14 +02:00
dfighter1985
d6524e27ff Update qrc location. 2014-07-22 14:44:31 +02:00
dfighter1985
a9a4f4eaa3 Merged default. 2014-07-22 00:15:50 +02:00
dfighter1985
e2ab3dc0c6 Error message when files can't be opened. 2014-07-21 23:25:35 +02:00
dfighter1985
7f1f8d4adc Added save and save as items to the context menu. 2014-07-21 23:08:05 +02:00
dfighter1985
411bc20f79 Shouldn't crash when adding a new row. 2014-07-21 17:46:01 +02:00
dfighter1985
62c6980a14 Mark translated item with green, untranslated ones with red. 2014-07-21 04:11:53 +02:00
dfighter1985
afb1f84feb New context menu options: mark / unmark translated. 2014-07-21 03:51:03 +02:00
dfighter1985
dff11950f5 Make sure a correct hash is not used for untranslated strings. 2014-07-21 03:24:18 +02:00
dfighter1985
58bf7c4dee Save to the right file. 2014-07-20 20:03:16 +02:00
dfighter1985
b8ff30885a Set header text according to the language. 2014-07-20 19:52:23 +02:00
dfighter1985
fd36c7676b Work with translated files, instead of work files. 2014-07-20 17:24:04 +02:00