Commit graph

453 commits

Author SHA1 Message Date
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
dfighter1985
ab54a00f1e Ask for confirmation before deleting a row. 2014-07-19 17:26:59 +02:00
dfighter1985
3d1752a569 Show insert / delete row in context menu. 2014-07-19 17:23:53 +02:00
dfighter1985
279db31a5b Implemented row deletion / insertion. 2014-07-18 01:52:23 +02:00
dfighter1985
ffa6d8b958 Use the QWidget modified property instead of the UXTEditor's own. 2014-07-18 01:18:41 +02:00
dfighter1985
d7564b2fda Allow only 1 instance of the uxt editor. 2014-07-18 01:08:31 +02:00
dfighter1985
4345445129 Added copyright headers to the new files. 2014-07-18 00:53:36 +02:00
dfighter1985
bc1b9600e2 Implemented saving. 2014-07-18 00:50:40 +02:00
dfighter1985
7abf5b2aa1 Apply table changes to the loaded data, and offer to save when closing the changed table. 2014-07-18 00:27:05 +02:00
dfighter1985
d4f57a1902 Set header texts. 2014-07-17 19:17:02 +02:00
dfighter1985
e5fd9ca07b UXT Editor widget 2014-07-17 19:08:29 +02:00
KISHAN GRIMOUT
bc45823645 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
9a9ebf5f81 Fix #71 2014-07-28 22:16:41 +02:00
kaetemi
5aef77afe5 Backed out changeset: 7bdb27443f88 2014-07-28 22:15:09 +02:00
kaetemi
f81032039a Fix self illumination color widget in NeL Material script 2014-07-28 18:32:05 +02:00
kaetemi
27269065ab Fix NeL Material script defaults, fix #166 2014-07-28 18:31:40 +02:00
kaetemi
6db922232e Adjust 3ds Max plugin versioning info 2014-07-28 18:31:20 +02:00
kervala
7b32c84f3b Changed: Determinates 3dsmax SDK base directory 2014-07-19 14:04:19 +02:00
kervala
1259c1dd5c Fixed: Give priority to fmod64 in 64 bits 2014-07-19 14:03:22 +02:00
kervala
a9b162b016 Fixed: Initialization of pointers in constructor 2014-07-19 14:02:43 +02:00
kervala
fb40a59387 Changed: Minor optimization and warning 2014-07-19 14:01:44 +02:00
kervala
f7d9b32051 Changed: Replaced tests with .size() by .empty() because faster 2014-07-19 14:01:03 +02:00
kervala
0e95ce2a25 Fixed: Some typos 2014-07-19 13:59:54 +02:00
kervala
2508728714 Changed: Minor change 2014-07-19 11:24:07 +02:00
kervala
fd4376b1a4 Changed: Some Big endian swaps (for PowerPC especially) 2014-07-19 11:23:49 +02:00
kervala
892c2d9a45 Fixed: Use UTF-8 for French translations
Changed: Improved some translations (more to come)
2014-07-19 11:19:34 +02:00
kervala
2d4c4cd3cf Fixed: Warning 2014-07-19 11:16:43 +02:00
kervala
7c95946416 Changed: Replaced atof by NLMISC::fromString 2014-07-19 11:14:38 +02:00
dfighter1985
f27af0f68d I don't really know what to write here. 2014-07-16 02:52:17 +02:00
dfighter1985
cbc3b5a8c9 Set the undostack so we won't crash... 2014-07-15 21:46:16 +02:00
dfighter1985
a24ad81206 Initialize the undostack to NULL, so we get a proper crash instead of a dangled pointer crash. 2014-07-15 21:41:11 +02:00
dfighter1985
269613fc82 Fixed another crash. 2014-07-15 20:29:57 +02:00
dfighter1985
cc9647c098 'Fixed' the Mission Compiler crash. 2014-07-15 20:19:53 +02:00
dfighter1985
2b31989661 When changing a property make sure to set default to false, so it's actually saved! 2014-07-15 18:51:06 +02:00
kaetemi
a83849a38e Disable WG specifics in r2_login script 2014-07-15 15:25:09 +02:00
dfighter1985
e651c563e5 Save world editor files. 2014-07-15 01:30:30 +02:00
kaetemi
c19130574e Restructure web. IMPORTANT! This moves all web files to a new central directory. Update your configuration if necessary 2014-07-14 20:27:46 +02:00
kaetemi
03396c015c One set of SQL scripts to rule them all 2014-07-14 19:15:23 +02:00
dfighter1985
b72b78fb84 Trying to load an invalid world editor file shouldn't crash the application, and an error messagebox should inform the user. 2014-07-13 21:38:14 +02:00
kaetemi
961ed99b7a HID: Adjust free look 2014-07-12 17:47:00 +02:00
kaetemi
2ab62ae9b2 Trash DirectInput 2014-07-12 17:17:24 +02:00
dfighter1985
13cfad6336 Apply property changes. 2014-07-12 01:54:45 +02:00
dfighter1985
0eec17b462 Block only the propertychanged signal in the const_string_array property manager. 2014-07-12 00:38:35 +02:00
dfighter1985
7c7523afe8 Store QtProperty, IPrimitive pairs and look the primitive up when the property changes. 2014-07-12 00:01:17 +02:00
dfighter1985
0adbf0496a Changed property to p, property is a reserved word in VS. 2014-07-11 20:47:24 +02:00
dfighter1985
cf35ac8fae Use \n instead of ; as a separator. 2014-07-11 20:41:15 +02:00
dfighter1985
c2b19ca07d Identation 2014-07-11 20:37:32 +02:00
dfighter1985
c1a97c54d6 Implemented const_string_array editor. 2014-07-11 20:35:05 +02:00
dfighter1985
2419e46a0f Workaround related to the unknown statusbar crash. 2014-07-09 23:20:50 +02:00
dfighter1985
1f009a436d Copyright banner + line endings... I always mess this up somehow.. 2014-07-09 21:13:57 +02:00
dfighter1985
7e6b3ffa06 Texture chooser now supports atlas textures as well. 2014-07-09 21:07:12 +02:00
kaetemi
868ff2d106 Fix #162: Center ingame mouse cursor after login 2014-07-09 12:31:22 +02:00
kaetemi
2efdca688e Formatting: Use tabs 2014-07-09 16:59:55 +02:00
KISHAN GRIMOUT
b99dab48c6 fix windows 64bit build in mem_displayer.cpp 2014-07-09 13:41:43 +02:00
kaetemi
ec7e6a0188 Trash DirectInput 2014-07-08 22:21:11 +02:00
dfighter1985
81b56397dc Added texture property editor, editor factory, manager. Textures can now be selected using these in the property tree browser. 2014-07-08 18:59:30 +02:00
dfighter1985
76ae9f5c3d Added action property editor, editor factory, manager. Actions can now be edited using the editor widget in the property tree. 2014-07-08 18:26:20 +02:00
dfighter1985
ba43964ca3 Allow TextureChooser's texture selection to be queried. 2014-07-07 19:19:03 +02:00
shubham_meena
1546cfc57a fixed few bugs 2014-07-07 13:56:58 +05:30
dfighter1985
2277dbb92b CPath can now return the file list with a path filter. 2014-07-06 23:21:25 +02:00
shubham_meena
75cfa80376 branch updated 2014-07-07 02:12:40 +05:30
shubham_meena
c23e45172d merging conflicts 2014-07-07 01:57:08 +05:30
shubham_meena
296836f94a removed merged conflicts 2014-07-07 01:48:42 +05:30
shubham_meena
b59e3bdf9a updates database 2014-07-05 13:01:56 +05:30
dfighter1985
b4ef9e6a01 Make sure to always convert to plain bitmap. 2014-07-05 03:31:21 +02:00
dfighter1985
7574fe4c26 No need to store the loaded image data after passing it to the label. 2014-07-05 03:13:01 +02:00
dfighter1985
249c082e9f Prototype of the texture chooser. 2014-07-05 02:55:46 +02:00
shubham_meena
cf227fc717 hook functionality 2014-07-03 16:44:37 +05:30
dfighter1985
ed6f5d1412 ActionList dialog can now select an action, and is used with the proc editor. 2014-07-03 00:44:38 +02:00
dfighter1985
a30caef9e1 Added facilities for viewing the loaded actions. 2014-07-02 22:27:04 +02:00
dfighter1985
d52ae8cd56 Line endings... 2014-07-02 20:44:46 +02:00
dfighter1985
b30536d92d Changed some property types. 2014-07-01 01:54:55 +02:00
dfighter1985
c52f20e583 Bitmap alignment can now be set as an enum. 2014-07-01 01:51:41 +02:00
dfighter1985
31ee29c7dc Quelled some compiler compliants. 2014-06-29 03:01:43 +02:00
dfighter1985
b65fd4b18b tooltip parent is now changable using an enum. 2014-06-29 02:53:33 +02:00
dfighter1985
1269cb33b9 Tooltip posrefs are now enums in the GUI Editor. 2014-06-29 01:44:06 +02:00
dfighter1985
092d591a18 Forgot the widget settings... 2014-06-27 00:49:31 +02:00
dfighter1985
62d0de2c55 Got rid of a memleak. 2014-06-27 00:47:29 +02:00
dfighter1985
c45f3547e5 The proper enum type is now determined by type not name. 2014-06-27 00:24:31 +02:00
dfighter1985
3ac5ecc59b text posref is now an enum too. 2014-06-27 00:07:44 +02:00
shubham_meena
b654096371 function to install update in the plugin 2014-06-23 14:36:29 +05:30
dfighter1985
b108dd7d34 Some refactoring. 2014-06-21 22:55:10 +02:00
kaetemi
6bf6b5f0df Fix compile 2014-06-21 22:32:49 +02:00
dfighter1985
c004b02091 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
8172d78b1b 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
c5d8bd6ec4 Exit with error 2014-06-21 05:46:20 +02:00
kaetemi
e18ff04e15 Fix compile 2014-06-20 23:38:44 +02:00
kaetemi
46921fd76a Fix compile 2014-06-20 23:24:54 +02:00
kaetemi
51ff443521 Add option for -mfpmath=both flag 2014-06-20 19:46:33 +02:00
kaetemi
f4b55b8823 Add SSE3 compile flag if enabled 2014-06-20 18:51:34 +02:00
kaetemi
871fa848df Compile fix 2014-06-20 17:53:38 +02:00
dfighter1985
73c099ae70 Text justification can now be set using an enum property editor. 2014-06-20 17:07:27 +02:00
dfighter1985
0fcfbafa1e A little refactoring 2014-06-20 16:26:10 +02:00
dfighter1985
698478a7fb Button types can now be set using an enum property editor. 2014-06-20 16:22:07 +02:00
dfighter1985
a6c994d9c4 Line endings... 2014-06-20 15:09:13 +02:00
kaetemi
94c830db81 SSE2: Compile fix 2014-06-20 03:08:51 +02:00
dfighter1985
d1e97345da As Object Viewer no longer uses the QtOpenGL widget this is not needed. 2014-06-19 18:40:50 +02:00
dfighter1985
879a332d6d More widgets can use the color picker now. 2014-06-19 17:21:11 +02:00
shubham_meena
6bf7b3dea9 template with list of updates 2014-06-19 17:16:24 +05:30
shubham_meena
ede1539b6d template for updates of plugins 2014-06-19 17:11:10 +05:30
shubham_meena
f391817c4a check functionality for existing updates 2014-06-19 14:53:49 +05:30
dfighter1985
4af4bb1fa4 Added color picking support to the GUI Editor. TODO: change all the widget definitions. 2014-06-18 16:48:33 +02:00
shubham_meena
a94d184a39 updating functionality with some error fixes 2014-06-18 15:10:31 +05:30