Commit graph

4682 commits

Author SHA1 Message Date
botanic
36cbfcbce8 upgrade nel lib version 2014-09-07 05:41:35 -07:00
botanic
dfb748b06f Merge 2014-09-07 05:40:29 -07:00
botanic
08301dcb44 setup modifications 2014-09-07 05:40:02 -07:00
botanic
ca8270bf65 Initial Domain Management Plugin 2014-09-07 05:39:48 -07:00
botanic
2f1f2139b5 added initial domain_management plugin, also fixed potental conflicting hook names 2014-09-07 03:17:20 -07:00
kaetemi
6f2ac8e535 Cleanup shard table 2014-09-07 09:10:23 +02:00
kaetemi
55d2685aca Change ClientApplication to DomainId in permission table 2014-09-07 08:53:10 +02:00
kaetemi
b1af237e5a Cleanup some English AMS translations 2014-09-07 04:21:08 +02:00
kaetemi
246e7d4930 Cleanup some English AMS translations 2014-09-07 04:16:07 +02:00
kaetemi
768bfd0238 Bugfix 2014-09-07 03:51:10 +02:00
kaetemi
41cdd65964 Bugfix 2014-09-07 03:47:55 +02:00
kaetemi
65a4681d36 Add login configuration 2014-09-07 03:43:00 +02:00
kaetemi
778a55d022 This might fix #193 2014-09-06 21:25:07 +02:00
kaetemi
c9b3d84f4c Syntax styling 2014-09-06 20:59:21 +02:00
kaetemi
7095bf0864 This should fix #193 2014-09-06 20:56:06 +02:00
botanic
3471c23eb6 Merge 2014-09-05 22:24:41 -07:00
botanic
2694a99c85 fix missing pcntl_fork func 2014-09-05 22:24:09 -07:00
kaetemi
7499ed408c Add more paranoia 2014-09-06 06:49:42 +02:00
kaetemi
d9ce522e0a Now really, don't execute any scripts here 2014-09-06 06:40:33 +02:00
kaetemi
4765f63328 Saner behaviour to show Forbidden error 2014-09-06 04:55:17 +02:00
kaetemi
510bb2074b Add upgrade script 2014-09-06 04:44:08 +02:00
botanic
4f51c4cdb6 fixed sync to be more robust 2014-09-05 19:38:53 -07:00
botanic
f9c4c3ac1f throw error on non-writable file 2014-09-05 19:26:12 -07:00
botanic
d1a300e751 forgot $AMS_TMPDIR 2014-09-05 19:18:17 -07:00
botanic
1d15bdfab3 Merge 2014-09-05 18:46:33 -07:00
botanic
e7ca564187 Fix #189 2014-09-05 18:46:13 -07:00
kaetemi
c782592d9d Make files folder safe to use 2014-09-06 03:44:58 +02:00
kaetemi
b638219dbd Make files folder safe to use 2014-09-06 03:43:31 +02:00
kaetemi
0e76ed6386 Protect shard admin auth SQL queries 2014-09-06 01:40:37 +02:00
kaetemi
4a186cc233 Fix version number 2014-09-06 00:38:20 +02:00
kaetemi
5abb581602 Merge 2014-09-06 00:37:29 +02:00
kaetemi
f46cb42bed Create shard admin user in setup 2014-09-06 00:35:28 +02:00
dfighter1985
15f6ed3c37 Merged default. 2014-09-05 22:28:11 +02:00
dfighter1985
029ebdc751 Get type info from DFN. 2014-09-05 21:42:14 +02:00
dfighter1985
ca910cf17a Added support for manipulating atoms. 2014-09-05 20:28:43 +02:00
dfighter1985
49f216ca0e Appending, resizing arrays, deleting array members should now create the proper new nodes. 2014-09-05 19:41:51 +02:00
dfighter1985
c4e01eaca6 Added support for adding atoms and virtual structs in the treeview. 2014-09-05 18:58:47 +02:00
kervala
ad5cc68107 Changed: Code formatting 2014-09-05 15:42:53 +02:00
dfighter1985
2020638e35 Do the same when readding items after a deletion. 2014-09-05 15:20:22 +02:00
dfighter1985
12996110fc Add new array entries with all their children. 2014-09-05 15:13:58 +02:00
botanic
4b526a4761 Merge 2014-09-05 02:31:56 -07:00
botanic
4368fb7f64 only show powered by and version when admin 2014-09-05 02:30:50 -07:00
botanic
5f5cfd2df6 added version number to ams 2014-09-05 02:27:08 -07:00
kaetemi
2a6edf5c0f Merge 2014-09-05 11:22:47 +02:00
kaetemi
17234d6398 Merge 2014-09-05 11:22:18 +02:00
kaetemi
b273806cf0 Validate setup password 2014-09-05 11:21:21 +02:00
botanic
4ce203b32c remove unecessery printing 2014-09-05 02:21:00 -07:00
botanic
bb38a64e78 fixed some caching 2014-09-05 02:17:19 -07:00
botanic
6ca575ef33 remove errolog 2014-09-05 02:10:32 -07:00
botanic
6b92b85b04 fix sync 2014-09-05 02:10:09 -07:00
kaetemi
daf80ea104 Add basis for database upgrades 2014-09-05 11:07:25 +02:00
botanic
85910829a7 Made filesize friendly 2014-09-05 01:30:54 -07:00
botanic
88afbeac83 remove old file 2014-09-05 01:22:39 -07:00
botanic
42a6c38080 added placeholder 2014-09-05 01:22:19 -07:00
botanic
0076828ee0 added placeholder 2014-09-05 01:21:59 -07:00
botanic
851ffd2bb6 Merge 2014-09-05 01:20:39 -07:00
botanic
cad8ea9592 Fix #190 2014-09-05 01:20:00 -07:00
kaetemi
856213a2aa Alternative redirect script 2014-09-05 10:11:50 +02:00
kaetemi
927eda9188 Merge 2014-09-05 10:01:20 +02:00
kaetemi
bd5cbd9357 Modularize web setup 2014-09-05 09:57:06 +02:00
botanic
2f4d30dc1b forgot to add variable 2014-09-05 00:52:38 -07:00
botanic
0570aedff7 Fix #188 2014-09-05 00:50:07 -07:00
botanic
a5f5c0ce37 added new ticket_attachment table to installer properly 2014-09-04 21:34:57 -07:00
botanic
a49a6f7c4b fixed installer 2014-09-04 20:29:45 -07:00
botanic
460298c773 Upload button setup
TODO: add files to database
TODO: hash folder to stick files in
2014-09-04 19:58:04 -07:00
botanic
49370fb5a4 Merge 2014-09-04 17:27:29 -07:00
botanic
58a2208fe9 Fix #111 2014-09-04 17:26:22 -07:00
dfighter1985
8d3c8de517 Enter a log entry when creating new documents. 2014-09-04 15:41:17 +02:00
dfighter1985
63972b8c43 Merged default. 2014-09-03 20:27:01 +02:00
dfighter1985
6457ab90eb Added support for creating new form documents 2014-09-03 19:55:46 +02:00
dfighter1985
256d72fe62 Added support for new DFN document creation. 2014-09-03 19:37:49 +02:00
dfighter1985
d139bc9f8d Added support for new typ document creation. 2014-09-03 19:28:01 +02:00
dfighter1985
3e3a9b8585 Error messages 2014-09-03 19:14:32 +02:00
dfighter1985
6954103b61 A little refactoring, dialogs are now loaded using the full filepath. 2014-09-03 19:11:38 +02:00
dfighter1985
ec20f009e7 Added GUI stub for new types/Dfns/forms. 2014-09-03 18:33:09 +02:00
dfighter1985
1be8e6f6a8 Removed m_modified, since the base widget has a field for this. 2014-09-03 17:25:11 +02:00
dfighter1985
baec2d1155 Form editor should trigger the save button properly now. 2014-09-03 17:22:09 +02:00
dfighter1985
a0194f5d24 Added missing copyright headers. 2014-09-03 17:12:25 +02:00
dfighter1985
2802f9e6cb Log changes and save log. 2014-09-03 16:42:12 +02:00
dfighter1985
c2738ecf73 Mark the typ dialog modified after a modification. 2014-09-03 16:26:52 +02:00
dfighter1985
4239748047 Apply changes. 2014-09-03 16:14:38 +02:00
dfighter1985
43bf6cebed Load type data into the property browser. 2014-09-03 16:08:13 +02:00
botanic
6fe49dfe92 fix settings width 2014-09-03 05:27:38 -07:00
botanic
fcbca9c5ed margins in element-style...really? 2014-09-03 05:05:21 -07:00
botanic
0dc2509c0e fix #185 2014-09-03 05:00:36 -07:00
botanic
0004241718 Merge 2014-09-03 04:42:54 -07:00
botanic
157c286502 fix support group bug and dblayer bug 2014-09-03 04:42:28 -07:00
Matthew Lagoe
fc5d684403 Merged in shubham_meena/ryzomcore (pull request #71)
documentation for doxygen containing plugin management system
2014-09-03 04:15:02 -07:00
botanic
fa0262bc0a Fix syntax error with unassigned ticket 2014-09-03 04:13:44 -07:00
botanic
fb18ee6f54 fixed language when logged in 2014-09-03 04:03:01 -07:00
botanic
ef2477fa23 updated bootstrap and charisma 2014-09-03 03:22:14 -07:00
botanic
e44cd3d40e updating plugins 2014-09-03 01:28:27 -07:00
botanic
6b484f7cbb Fix path's in plugins 2014-09-03 01:13:08 -07:00
botanic
f29aa60fc7 fixed change email on shard 2014-09-03 00:23:47 -07:00
botanic
ceb1a30e17 Changed to use new throw new SystemExit(); 2014-09-02 23:30:25 -07:00
botanic
6edcdcf65f Merge 2014-09-02 23:26:53 -07:00
botanic
556f246b81 Fix add user in settings 2014-09-02 23:24:41 -07:00
kaetemi
b691fa9694 Crash workaround 2014-09-03 08:18:21 +02:00
kaetemi
2c2f776f3a Remove bad data in sql 2014-09-03 07:38:24 +02:00
kaetemi
88ca2ab7e9 Don't cache redirects 2014-09-03 07:36:10 +02:00
kaetemi
37e0201a5f Throw exception instead of exit. 2014-09-03 07:23:39 +02:00
kaetemi
591a038ad3 Merge 2014-09-03 07:07:55 +02:00
kaetemi
50a3791553 Die, don't exit 2014-09-03 07:06:43 +02:00
botanic
82aaca7eea Merge 2014-09-02 21:40:10 -07:00
botanic
7b27b580b1 Fix #181 2014-09-02 21:39:35 -07:00
kaetemi
6d98bb0493 Merge 2014-09-03 06:39:20 +02:00
kaetemi
fd59c37eda Force all user ids equal 2014-09-03 06:38:38 +02:00
botanic
e75cb7fabc Fix #182 2014-09-02 21:32:48 -07:00
botanic
72db8409a5 Merge 2014-09-02 21:26:09 -07:00
botanic
419f8349dd settings page display bug 2014-09-02 21:25:39 -07:00
kaetemi
c008e0b46d Transactions not required here either, actually 2014-09-03 06:16:41 +02:00
kaetemi
4982e7c6c4 Merge 2014-09-03 06:08:08 +02:00
kaetemi
27efa58777 Reduce unnecessary manual transaction commit 2014-09-03 06:07:02 +02:00
botanic
d9a2e44e9e Merge 2014-09-02 21:04:22 -07:00
botanic
099bce3701 missing ) 2014-09-02 21:03:51 -07:00
botanic
220a93a133 updated hgignore as well as fixed php errors 2014-09-02 20:55:51 -07:00
kaetemi
44b8223a5f Disable connection cache workaround 2014-09-03 05:47:47 +02:00
kaetemi
3f9eb61e07 Don't create transactions for SELECT queries 2014-09-03 05:39:16 +02:00
kaetemi
33d7bf5c15 Fix #180 2014-09-03 05:11:11 +02:00
kaetemi
fdc514b039 Fix #180 2014-09-03 04:46:08 +02:00
kaetemi
011869167d Only make a single database connection per host, and keep them persistent 2014-09-03 03:51:11 +02:00
kaetemi
379e04dc25 Remove excessive javascript interactivity in AMS 2014-09-03 03:08:57 +02:00
kaetemi
bf7a91b3fc Some more adjustments for DBLayer... 2014-09-03 03:08:22 +02:00
dfighter1985
d146d91ab1 Mark the DFN editor modified after adding / removing an element. 2014-09-03 00:00:52 +02:00
dfighter1985
5022549a0d Implemented saving. 2014-09-02 23:54:42 +02:00
dfighter1985
3d6a9fb139 Implemented add button. 2014-09-02 23:37:16 +02:00
dfighter1985
9422a67cf3 Implemented definition editing. 2014-09-02 23:25:47 +02:00
dfighter1985
8635cd3c65 Implemented remove button. 2014-09-02 23:07:55 +02:00
dfighter1985
a76a6b6e85 Load comments, log, and definitions. 2014-09-02 23:00:32 +02:00
dfighter1985
3b270c3e9e Delete DFN when destroying a DFN editor... 2014-09-02 22:47:18 +02:00
dfighter1985
a66582cff5 Load .typ file. 2014-09-02 22:46:19 +02:00
dfighter1985
62fb0ca1ae Added GUI for the Type editor. 2014-09-02 22:32:56 +02:00
kaetemi
6fed8bad5b Re-use the database connection 2014-09-02 20:39:07 +02:00
kaetemi
6acf67d03b Make login and email unique keys 2014-09-02 20:17:53 +02:00
dfighter1985
5fa370463b Logging DFN changes. 2014-09-02 20:13:10 +02:00
kaetemi
57781ca616 Remove invalid behaviour with ring databases 2014-09-02 19:56:37 +02:00
dfighter1985
0904c30803 No comment. Literally! :D 2014-09-02 19:32:05 +02:00
dfighter1985
a875e66696 Implemented add and remove buttons. 2014-09-02 19:26:02 +02:00
kaetemi
6a8e2f314e Move misleading copyright notices to a more appropriate location 2014-09-02 19:01:15 +02:00
kaetemi
aebaac46c8 Web services setup tool, fix #141 2014-09-02 18:34:09 +02:00
dfighter1985
bca9fd9347 Save changes. 2014-09-02 15:31:14 +02:00
dfighter1985
298268b88e Change the name in the list too. 2014-09-02 15:13:48 +02:00
dfighter1985
8163f41473 Enable saving when modified, disable saving after saving. 2014-09-02 15:11:28 +02:00
dfighter1985
2292fc96c4 Apply changes. 2014-09-02 14:54:07 +02:00
kaetemi
262d9c006b Move SQL files 2014-09-02 14:36:31 +02:00
dfighter1985
2e9de8cef3 Added first iteration of the file path property manager / editor / factory. 2014-09-01 23:06:23 +02:00
dfighter1985
3929b62e48 Use enum property manager for the type. 2014-08-31 23:21:19 +02:00
dfighter1985
23c27349c3 Load DFN. 2014-08-31 22:42:49 +02:00
dfighter1985
e44733dfa6 Added common base class for Typ, Dfn, and From dialogs: GeorgesDockWidget. 2014-08-31 21:25:12 +02:00
dfighter1985
ff88a345a8 Added GUI for DFN dialog. 2014-08-31 20:21:31 +02:00
dfighter1985
f56ab5fbaa Merged default 2014-08-30 23:02:14 +02:00
dfighter1985
e5b2d05fa7 EOL 2014-08-30 22:23:21 +02:00
dfighter1985
2a3751dae2 Show an error message when form loading fails. 2014-08-30 21:37:11 +02:00
dfighter1985
b11474e6be Renamed signal. 2014-08-30 21:32:28 +02:00
kervala
4d50808bfe Fixed: EOL 2014-08-30 16:21:25 +02:00
kervala
63d62391a7 Changed: Preserve attributes when copying files in Application Bundle 2014-08-30 16:20:36 +02:00
dfighter1985
8d99120409 Save the log too, when saving.. 2014-08-27 20:30:16 +02:00
dfighter1985
2ebc1d59ef Mark file modified even when using the context menu. 2014-08-27 20:25:30 +02:00
dfighter1985
127e0b48ef Implemented rename context menu. 2014-08-27 20:24:05 +02:00
dfighter1985
6cc882e95e Now logging changes. 2014-08-27 19:22:10 +02:00
dfighter1985
14a5a81c60 Load log into the log tab. 2014-08-27 17:37:53 +02:00
dfighter1985
9249ec3dcb Don't disable the log tab! 2014-08-27 17:34:26 +02:00
dfighter1985
55c22bbce8 Implement 'delete array entry' context menu command. 2014-08-27 16:23:16 +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
dfighter1985
58eb1bc9eb Implemented 'append array entry' context menu 2014-08-27 01:14:49 +02:00
kaetemi
f601e916bf Remove warnings, ref #177 2014-08-26 13:48:34 +02:00
kaetemi
d02891b939 Adjust casts, ref #177 2014-08-26 13:33:18 +02:00
kaetemi
429219db7a Inventory bug workaround, ref #177 2014-08-25 15:32:00 +02:00
kaetemi
119c931738 Link group_wheel.cpp, ref #176 2014-08-25 14:56:29 +02:00
dfighter1985
205f374a2a Crash fixes related to Georges array size changing. 2014-08-20 23:36:53 +02:00
dfighter1985
56b335ca9e Added support for creating arrays. 2014-08-20 23:18:16 +02:00
dfighter1985
f32ded34fa Initialize CFormItem fields... 2014-08-20 19:57:16 +02:00
dfighter1985
6d19500e35 When reaching 0 array size, delete the array node. 2014-08-20 18:22:20 +02:00
kaetemi
0f236b800f Merge with default 2014-08-19 15:43:49 +02:00
kaetemi
539f10fafa EOL 2014-08-19 15:42:42 +02:00
kaetemi
36f77a2ab0 EOL 2014-08-19 15:38:16 +02:00
kaetemi
2abbd37304 EOL 2014-08-19 15:37:31 +02:00
dfighter1985
8523452d2b Save from the file menu too. 2014-08-19 01:57:20 +02:00
dfighter1985
e59fb841bc Merged default. 2014-08-19 00:33:03 +02:00
kaetemi
a947afc387 Merge 2014-08-18 21:14:27 +02:00
kaetemi
a119349a7e Crashfix in case pacs_prim are exported into .ig 2014-08-18 20:23:27 +02:00
dfighter1985
d4585aea4d Save changes. 2014-08-18 19:49:32 +02:00
shubham_meena
74503f666c documentation for doxygen containing plugin management system 2014-08-18 21:43:24 +05:30
dfighter1985
6b5f6da809 Array resize. 2014-08-18 18:03:48 +02:00
Matthew Lagoe
78894a03b5 Merged in shubham_meena/ryzomcore (pull request #70)
Adding comments with more description and removed doxygen errors
2014-08-18 00:55:01 -07:00
shubham_meena
77d9dd967f Improved documentation with doxygen generated doc 2014-08-18 07:13:15 +05:30
dfighter1985
e5a7b28e4b Moved BrowserCtrlPvt to it's own files. 2014-08-18 01:50:07 +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
dfighter1985
d5dec4a681 Use the string 'array size' as the name for the property holding the array size. 2014-08-16 03:46:52 +02:00
dfighter1985
408e050ce2 Only add atoms to the property browser.. 2014-08-16 03:10:50 +02:00
dfighter1985
3c90938c47 Only add atoms to the property browser.. 2014-08-16 02:51:30 +02:00
dfighter1985
76a7980e23 Handle selected arrays too ( show size, changing it isn't implemented yet ). 2014-08-16 02:47:29 +02:00
dfighter1985
9128c712e6 Only add atoms to the property browser. 2014-08-16 02:01:07 +02:00
dfighter1985
02b2fc5b81 Fixed a crash. Setting a value into a valueless Georges node doesn't assign a type, which leads to a crash when trying to poll the value directly from the node. However if the value is polled indirectly using the node's name the value can be retrieved without a crash. 2014-08-15 23:49:12 +02:00
botanic
67ab6b4377 updated hgignore 2014-08-15 03:55:49 -07:00
botanic
a2312c1e1b updated doxygen 2014-08-15 03:49:39 -07:00
shubham_meena
2c580b97aa Merged in Gsoc14-ryzomAppImprovements (pull request #1)
Merging Gsoc 14 branch with default
2014-08-15 01:05:39 +05:30
shubham_meena
1b5a6ec066 code modified to accept request through Rest and sending achievments in response 2014-08-15 00:24:31 +05:30
shubham_meena
771070ab19 bug fix in plugin installation 2014-08-15 00:13:00 +05:30
shubham_meena
4087169084 added option for posting data in REST api 2014-08-14 22:25:16 +05:30
shubham_meena
d865f2932b BugFixes: achievements and API key management plugins 2014-08-14 22:20:05 +05:30
shubham_meena
43959ab55d small bug fix: support group missing brackets at end 2014-08-13 18:32:13 +05:30
shubham_meena
34d5d60779 Added few more options in REST api 2014-08-13 12:57:30 +05:30
kaetemi
cb448176b5 Snowballs update 2014-08-12 21:11:55 +02:00
dfighter1985
2cea18eae8 Apply changes. 2014-08-12 21:00:33 +02:00
dfighter1985
964a5d4e4c Shown properties can now be edited. 2014-08-12 20:17:10 +02:00
dfighter1985
63fd3faad6 First iteration of the property browser. 2014-08-12 19:26:55 +02:00
shubham_meena
1005be5905 Bug Fix: delete plugin option available for inactive plugins 2014-08-12 12:46:22 +05:30
shubham_meena
b949fe3144 API key management plugin for ams 2014-08-12 00:33:58 +05:30
shubham_meena
c23e441881 Achievements plugin integrated with ams 2014-08-12 00:33:11 +05:30
shubham_meena
b756f128ba added API key mangement and Achievements plugin during installation of ams 2014-08-12 00:23:48 +05:30
shubham_meena
61b86da6a5 Adding activated plugins to the main options list 2014-08-11 22:57:08 +05:30
dfighter1985
340684e1d6 Don't enter edit mode in the treeview. 2014-08-10 15:25:59 +02:00
kaetemi
cfd8f79b3d Use software cursor with attached display 2014-08-07 19:45:26 +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
dfighter1985
37e9c885b7 Add the property browser library to the CPack archive when generated. 2014-08-06 22:59:58 +02:00
dfighter1985
d82d5ec9f6 World Editor plugin Linux build fix. 2014-08-06 22:12:46 +02:00
dfighter1985
df4755222b GUI Editor Linux build fix 2014-08-06 22:10:11 +02:00
dfighter1985
62ea5d19ce Fixed qrc path. 2014-08-06 19:54:01 +02:00
dfighter1985
0f42cb7f49 Update the tile list right away if the image is replaced. 2014-08-06 17:40:39 +02:00
dfighter1985
b41686aa44 If I add a 256x256 tile, maybe I should remove it as 256x256, not 128x128... 2014-08-06 17:14:59 +02:00
kaetemi
7db83ce7da Process some scene traversals only once when rendering in stereo 2014-08-06 14:36:09 +02:00
dfighter1985
2f56a5eee4 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
3fc31ee2ad Removed yet another unused variable. 2014-08-06 13:04:30 +02:00
dfighter1985
4f05fea63c Removed unused variable. 2014-08-06 13:01:44 +02:00
kaetemi
758e87e115 OVR: Chroma factor 2014-08-05 20:14:58 +02:00
dfighter1985
f22f9fbc08 Repaint immediately when the display channel is changed. 2014-08-05 16:01:45 +02:00
dfighter1985
53f771690c Save the last directory where we loaded a tile image from. 2014-08-05 15:34:29 +02:00
dfighter1985
f23a557e77 Save the last directoy where we loaded a tilebank from. 2014-08-05 15:16:25 +02:00
dfighter1985
1e9e492f0f Rotation is now set in the tilebank wrapper and applied when replacing a tile. 2014-08-05 13:42:56 +02:00
dfighter1985
6c8ae2fafe Line endings and copyright headers... 2014-08-05 13:18:41 +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
dfighter1985
29bf9e0a93 Set all images by default. 2014-08-05 03:35:10 +02:00
dfighter1985
53e118eb04 Clear before loading the model data. 2014-08-05 03:20:30 +02:00
dfighter1985
a7022146ec Makes no sense, but doesn't seem to be crashing anymore o.O 2014-08-05 03:17:29 +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
dfighter1985
1255cdb3e7 Saving tilebank 2014-08-04 22:14:39 +02:00
dfighter1985
1309834e49 Texture path. 2014-08-04 21:59:05 +02:00
dfighter1985
716903fd5f Surface data. 2014-08-04 21:53:22 +02:00
dfighter1985
bcfcb5bb83 Oriented stuff. 2014-08-04 21:41:33 +02:00
dfighter1985
de15faa5d2 Vegetation set stuff. 2014-08-04 21:33:11 +02:00
dfighter1985
90b9a592b8 Most of the functionality works with the new code. 2014-08-04 21:22:44 +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
shubham_meena
a313d66c89 rest api using curl 2014-08-04 14:05:11 +05:30
kaetemi
b24fa74936 3D: Fix texture coords for FXAA on D3D 2014-08-04 07:38:40 +02:00
kaetemi
971b1ae96c Add FXAA to Ryzom Client 2014-08-04 06:19:19 +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
62d9785fa1 Cleanup snowballs2 2014-08-04 05:24:40 +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
dfighter1985
df4446701e Rotation can now be set. 2014-08-03 19:04:34 +02:00
kaetemi
f9aa0bf7cc GL: Share depth and stencil to get similar behaviour to D3D driver 2014-08-03 18:59:19 +02:00
dfighter1985
ca1f00e35a Save the tile border, etc data when saving. 2014-08-03 17:58:02 +02:00
dfighter1985
3823a9a01b Added checks. Yes it's horrible and needs to be refactored. 2014-08-03 04:15:12 +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
kaetemi
4add0e3610 Sound orientation with HMD and Headphones 2014-08-01 23:11:35 +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
shubham_meena
6388c2e3aa API key management calender 2014-08-01 16:01:35 +05:30
kaetemi
03e367be86 Merge with default 2014-08-01 11:50:40 +02:00
dfighter1985
b34db5e7da Apply the current zoom factor! 2014-08-01 02:38:04 +02:00
dfighter1985
66c8b95e2d Don't reload the pixmaps every time they are displayed... -.- 2014-08-01 02:34:57 +02:00
dfighter1985
2ddd7e1035 Line endings... 2014-07-31 23:23:52 +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
ab2e54a3c8 When hitting 'save as' ask for a filename even if one is set. 2014-07-30 15:55:09 +02:00
dfighter1985
6386c5aac4 Should store the filename after opening.. 2014-07-30 15:44:02 +02:00
dfighter1985
8ea69d4b81 Should only add 1 tile here... 2014-07-30 15:40:02 +02:00
dfighter1985
677d13c7ab 128 and 256 tiles don't have alpha, so no need to load/save them. 2014-07-30 15:29:50 +02:00
dfighter1985
fadd8fbf89 Replace and delete image should be applied to the correct channel now. 2014-07-30 14:39:19 +02:00
dfighter1985
0750ca7a4d Show the image that belongs to the channel that is selected. 2014-07-30 14:28:17 +02:00
dfighter1985
47a5f95b71 Copyright headers... 2014-07-30 11:20:29 +02:00
dfighter1985
8e3ec659d5 Close the loaded file and return true... 2014-07-30 11:15:14 +02:00
dfighter1985
4a69a4f8b2 Set teh current selection to row 0 2014-07-30 11:14:41 +02:00
dfighter1985
99683c6569 Save and load the tilebank texture path. 2014-07-30 11:10:15 +02:00
dfighter1985
447caab681 Save and load the veget set filename. 2014-07-30 10:58:37 +02:00
dfighter1985
e82ffc9b14 TileBank loading. 2014-07-30 10:54:08 +02:00
dfighter1985
5b2aa71b90 Add the already selected tilesets to the land when editing. 2014-07-30 07:43:02 +02:00
dfighter1985
240844c1cd Connected the oriented combobox and now saving it's value to the tilebank. 2014-07-30 01:50:01 +02:00
dfighter1985
a513af355d Implemented saving of the currently stored tilebank data. 2014-07-30 01:29:17 +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
nimetu
25b5ff5c1d Crafted tool durability, fix #156 2014-07-28 23:51:25 +02:00
dfighter1985
fed92a47d3 As it turns out, tilesets can be assigned to multiple lands... 2014-07-28 17:05:51 +02:00
dfighter1985
d3698a5c1a Implemented the GUI part of saving... 2014-07-27 20:38:08 +02:00
dfighter1985
2f9b4f1b5e 128x128 tab should be shown by default. 2014-07-27 18:23:25 +02:00
dfighter1985
aef9f58242 Implemented tile image replace. 2014-07-26 02:24:32 +02:00
dfighter1985
2f6faf05c1 Implemented tile image deletion. 2014-07-26 02:19:13 +02:00
dfighter1985
39bde4b257 A little refactoring. 2014-07-26 02:11:02 +02:00
dfighter1985
fe044b8592 Reindex tile item nodes after deleting a node. 2014-07-26 02:05:21 +02:00
dfighter1985
fc4856f28c Implemented tile deletion. 2014-07-26 01:57:50 +02:00
dfighter1985
4d0002a6f4 I must be blind... 2014-07-26 00:32:42 +02:00
dfighter1985
a1b8737776 Implemented Tile addition. 2014-07-26 00:29:37 +02:00
shubham_meena
03b029188f bug fix: added template path option in .info file 2014-07-26 00:27:57 +05:30
dfighter1985
41f8104f19 Implemented tilebank texture path setting. 2014-07-24 23:41:42 +02:00
dfighter1985
a14a16f935 Implemented choosing / resetting vegetset for tile sets. 2014-07-24 23:31:37 +02:00
dfighter1985
7b13b09e01 When selecting another land, select the first tile set, if it exists. 2014-07-24 18:44:00 +02:00
dfighter1985
8034eac2e0 Connect the selection model so the widgets are updated. 2014-07-24 18:39:34 +02:00
dfighter1985
25dba4695d 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
c1d6ada9c6 Implemented land name changing. 2014-07-24 16:25:28 +02:00
dfighter1985
c81e70b9b2 Implemented land removal. 2014-07-24 16:20:44 +02:00
dfighter1985
7c1f53994d Implemented land adding. 2014-07-24 16:18:01 +02:00
dfighter1985
f67e5b4e5b Renamed land related widgets. 2014-07-24 16:09:58 +02:00
dfighter1985
347a883d7b Implemented tileset move up and move down. 2014-07-24 02:28:19 +02:00
dfighter1985
764b80b751 Implemented tileset rename. 2014-07-23 21:53:09 +02:00
dfighter1985
acf3f656b2 Implemented tileset removal. 2014-07-23 18:35:26 +02:00
dfighter1985
068a10ea6d Don't try to delete the same items more than once! 2014-07-22 15:38:26 +02:00
dfighter1985
c369f49b8a Don't allow 2 tilesets to have the same name. 2014-07-22 15:35:14 +02:00
dfighter1985
395fafd2fe Update qrc location. 2014-07-22 14:44:31 +02:00
dfighter1985
8971f98722 Merged default. 2014-07-22 00:15:50 +02:00
dfighter1985
bfb04d7dda Error message when files can't be opened. 2014-07-21 23:25:35 +02:00
dfighter1985
7c0cd64ae7 Added save and save as items to the context menu. 2014-07-21 23:08:05 +02:00
dfighter1985
d63c78b503 Shouldn't crash when adding a new row. 2014-07-21 17:46:01 +02:00
dfighter1985
741fee935e Mark translated item with green, untranslated ones with red. 2014-07-21 04:11:53 +02:00
dfighter1985
7988a71c98 New context menu options: mark / unmark translated. 2014-07-21 03:51:03 +02:00
dfighter1985
232e830c3c Make sure a correct hash is not used for untranslated strings. 2014-07-21 03:24:18 +02:00
dfighter1985
164eac0eba Save to the right file. 2014-07-20 20:03:16 +02:00
dfighter1985
ad06212de7 Set header text according to the language. 2014-07-20 19:52:23 +02:00
dfighter1985
a51f76d036 Work with translated files, instead of work files. 2014-07-20 17:24:04 +02:00
dfighter1985
b0c916276d Ask for confirmation before deleting a row. 2014-07-19 17:26:59 +02:00
dfighter1985
39c43b03a8 Show insert / delete row in context menu. 2014-07-19 17:23:53 +02:00
kervala
0c3c9ca77a Changed: Determinates 3dsmax SDK base directory 2014-07-19 14:04:19 +02:00
kervala
fab8d1d22f Fixed: Give priority to fmod64 in 64 bits 2014-07-19 14:03:22 +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
29e875255f Fixed: Some typos 2014-07-19 13:59:54 +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
d02a3d7fe6 Fixed: Use UTF-8 for French translations
Changed: Improved some translations (more to come)
2014-07-19 11:19:34 +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
dfighter1985
ec89725824 Implemented row deletion / insertion. 2014-07-18 01:52:23 +02:00
dfighter1985
237ac85e9c Use the QWidget modified property instead of the UXTEditor's own. 2014-07-18 01:18:41 +02:00
dfighter1985
b86fce833c Allow only 1 instance of the uxt editor. 2014-07-18 01:08:31 +02:00