botanic
|
071530251e
|
Merge
|
2014-09-03 04:42:54 -07:00 |
|
botanic
|
9855aecc25
|
fix support group bug and dblayer bug
|
2014-09-03 04:42:28 -07:00 |
|
Matthew Lagoe
|
617b5f84f0
|
Merged in shubham_meena/ryzomcore (pull request #71)
documentation for doxygen containing plugin management system
|
2014-09-03 04:15:02 -07:00 |
|
botanic
|
f7d338bdf6
|
Fix syntax error with unassigned ticket
|
2014-09-03 04:13:44 -07:00 |
|
botanic
|
8e46cd7ab9
|
fixed language when logged in
|
2014-09-03 04:03:01 -07:00 |
|
botanic
|
f15d151fbd
|
updated bootstrap and charisma
|
2014-09-03 03:22:14 -07:00 |
|
botanic
|
f21fa61d5f
|
updating plugins
|
2014-09-03 01:28:27 -07:00 |
|
botanic
|
e373874bbf
|
Fix path's in plugins
|
2014-09-03 01:13:08 -07:00 |
|
botanic
|
912a15c1bd
|
fixed change email on shard
|
2014-09-03 00:23:47 -07:00 |
|
botanic
|
e2882d1b9f
|
Changed to use new throw new SystemExit();
|
2014-09-02 23:30:25 -07:00 |
|
botanic
|
fe8cb3595a
|
Merge
|
2014-09-02 23:26:53 -07:00 |
|
botanic
|
ea9324bd51
|
Fix add user in settings
|
2014-09-02 23:24:41 -07:00 |
|
kaetemi
|
54435b9258
|
Crash workaround
|
2014-09-03 08:18:21 +02:00 |
|
kaetemi
|
7edf900a2e
|
Remove bad data in sql
|
2014-09-03 07:38:24 +02:00 |
|
kaetemi
|
9c26f8e345
|
Don't cache redirects
|
2014-09-03 07:36:10 +02:00 |
|
kaetemi
|
41e0baca84
|
Throw exception instead of exit.
|
2014-09-03 07:23:39 +02:00 |
|
kaetemi
|
7a62843aee
|
Merge
|
2014-09-03 07:07:55 +02:00 |
|
kaetemi
|
71302bf982
|
Die, don't exit
|
2014-09-03 07:06:43 +02:00 |
|
botanic
|
441ede1cad
|
Merge
|
2014-09-02 21:40:10 -07:00 |
|
botanic
|
b081d97b3c
|
Fix #181
|
2014-09-02 21:39:35 -07:00 |
|
kaetemi
|
d9dac55a28
|
Merge
|
2014-09-03 06:39:20 +02:00 |
|
kaetemi
|
f920da3873
|
Force all user ids equal
|
2014-09-03 06:38:38 +02:00 |
|
botanic
|
c13264c207
|
Fix #182
|
2014-09-02 21:32:48 -07:00 |
|
botanic
|
5c63089b0a
|
Merge
|
2014-09-02 21:26:09 -07:00 |
|
botanic
|
5d6a38ec16
|
settings page display bug
|
2014-09-02 21:25:39 -07:00 |
|
kaetemi
|
2b2ffb8052
|
Transactions not required here either, actually
|
2014-09-03 06:16:41 +02:00 |
|
kaetemi
|
5954b96813
|
Merge
|
2014-09-03 06:08:08 +02:00 |
|
kaetemi
|
41385c3b8c
|
Reduce unnecessary manual transaction commit
|
2014-09-03 06:07:02 +02:00 |
|
botanic
|
a533354df8
|
Merge
|
2014-09-02 21:04:22 -07:00 |
|
botanic
|
110b36dd4a
|
missing )
|
2014-09-02 21:03:51 -07:00 |
|
botanic
|
dee11a74c9
|
updated hgignore as well as fixed php errors
|
2014-09-02 20:55:51 -07:00 |
|
kaetemi
|
d4423d956f
|
Disable connection cache workaround
|
2014-09-03 05:47:47 +02:00 |
|
kaetemi
|
a120179e75
|
Don't create transactions for SELECT queries
|
2014-09-03 05:39:16 +02:00 |
|
kaetemi
|
3ddf42f0ef
|
Fix #180
|
2014-09-03 05:11:11 +02:00 |
|
kaetemi
|
04ef076448
|
Fix #180
|
2014-09-03 04:46:08 +02:00 |
|
kaetemi
|
978c09b029
|
Only make a single database connection per host, and keep them persistent
|
2014-09-03 03:51:11 +02:00 |
|
kaetemi
|
75c5232dcf
|
Remove excessive javascript interactivity in AMS
|
2014-09-03 03:08:57 +02:00 |
|
kaetemi
|
340fae54ed
|
Some more adjustments for DBLayer...
|
2014-09-03 03:08:22 +02:00 |
|
dfighter1985
|
6cd4d756db
|
Mark the DFN editor modified after adding / removing an element.
--HG--
branch : dfighter-tools
|
2014-09-03 00:00:52 +02:00 |
|
dfighter1985
|
f587e06d7a
|
Implemented saving.
--HG--
branch : dfighter-tools
|
2014-09-02 23:54:42 +02:00 |
|
dfighter1985
|
173dbba11c
|
Implemented add button.
--HG--
branch : dfighter-tools
|
2014-09-02 23:37:16 +02:00 |
|
dfighter1985
|
a68dd4c33e
|
Implemented definition editing.
--HG--
branch : dfighter-tools
|
2014-09-02 23:25:47 +02:00 |
|
dfighter1985
|
ec8a7522b2
|
Implemented remove button.
--HG--
branch : dfighter-tools
|
2014-09-02 23:07:55 +02:00 |
|
dfighter1985
|
73a2b9bc90
|
Load comments, log, and definitions.
--HG--
branch : dfighter-tools
|
2014-09-02 23:00:32 +02:00 |
|
dfighter1985
|
a69e09af6f
|
Delete DFN when destroying a DFN editor...
--HG--
branch : dfighter-tools
|
2014-09-02 22:47:18 +02:00 |
|
dfighter1985
|
cfaebcc1ff
|
Load .typ file.
--HG--
branch : dfighter-tools
|
2014-09-02 22:46:19 +02:00 |
|
dfighter1985
|
24a7cc4a6d
|
Added GUI for the Type editor.
--HG--
branch : dfighter-tools
|
2014-09-02 22:32:56 +02:00 |
|
kaetemi
|
afe03367d9
|
Re-use the database connection
|
2014-09-02 20:39:07 +02:00 |
|
kaetemi
|
dfc65485ec
|
Make login and email unique keys
|
2014-09-02 20:17:53 +02:00 |
|
dfighter1985
|
0b9c281b2f
|
Logging DFN changes.
--HG--
branch : dfighter-tools
|
2014-09-02 20:13:10 +02:00 |
|
kaetemi
|
2bc60334c1
|
Remove invalid behaviour with ring databases
|
2014-09-02 19:56:37 +02:00 |
|
dfighter1985
|
e3d405454e
|
No comment. Literally! :D
--HG--
branch : dfighter-tools
|
2014-09-02 19:32:05 +02:00 |
|
dfighter1985
|
c51b519845
|
Implemented add and remove buttons.
--HG--
branch : dfighter-tools
|
2014-09-02 19:26:02 +02:00 |
|
kaetemi
|
b64ab2c828
|
Move misleading copyright notices to a more appropriate location
|
2014-09-02 19:01:15 +02:00 |
|
kaetemi
|
75dc4fc779
|
Web services setup tool, fix #141
|
2014-09-02 18:34:09 +02:00 |
|
dfighter1985
|
ed1c600c4d
|
Save changes.
--HG--
branch : dfighter-tools
|
2014-09-02 15:31:14 +02:00 |
|
dfighter1985
|
afc8aef238
|
Change the name in the list too.
--HG--
branch : dfighter-tools
|
2014-09-02 15:13:48 +02:00 |
|
dfighter1985
|
e2cb637a13
|
Enable saving when modified, disable saving after saving.
--HG--
branch : dfighter-tools
|
2014-09-02 15:11:28 +02:00 |
|
dfighter1985
|
f1a6a8d9cd
|
Apply changes.
--HG--
branch : dfighter-tools
|
2014-09-02 14:54:07 +02:00 |
|
kaetemi
|
b500066026
|
Move SQL files
|
2014-09-02 14:36:31 +02:00 |
|
dfighter1985
|
25d808f7ea
|
Added first iteration of the file path property manager / editor / factory.
--HG--
branch : dfighter-tools
|
2014-09-01 23:06:23 +02:00 |
|
dfighter1985
|
259dc63ac4
|
Use enum property manager for the type.
--HG--
branch : dfighter-tools
|
2014-08-31 23:21:19 +02:00 |
|
dfighter1985
|
e768506349
|
Load DFN.
--HG--
branch : dfighter-tools
|
2014-08-31 22:42:49 +02:00 |
|
dfighter1985
|
230159e2b6
|
Added common base class for Typ, Dfn, and From dialogs: GeorgesDockWidget.
--HG--
branch : dfighter-tools
|
2014-08-31 21:25:12 +02:00 |
|
dfighter1985
|
0a3d7d6355
|
Added GUI for DFN dialog.
--HG--
branch : dfighter-tools
|
2014-08-31 20:21:31 +02:00 |
|
dfighter1985
|
d232939294
|
Merged default
--HG--
branch : dfighter-tools
|
2014-08-30 23:02:14 +02:00 |
|
dfighter1985
|
cfabc13ffd
|
EOL
--HG--
branch : dfighter-tools
|
2014-08-30 22:23:21 +02:00 |
|
dfighter1985
|
ad4771e3d1
|
Show an error message when form loading fails.
--HG--
branch : dfighter-tools
|
2014-08-30 21:37:11 +02:00 |
|
dfighter1985
|
0d530f15f6
|
Renamed signal.
--HG--
branch : dfighter-tools
|
2014-08-30 21:32:28 +02:00 |
|
kervala
|
3625818283
|
Fixed: EOL
|
2014-08-30 16:21:25 +02:00 |
|
kervala
|
687927ba10
|
Changed: Preserve attributes when copying files in Application Bundle
|
2014-08-30 16:20:36 +02:00 |
|
dfighter1985
|
58b50e7d7e
|
Save the log too, when saving..
--HG--
branch : dfighter-tools
|
2014-08-27 20:30:16 +02:00 |
|
dfighter1985
|
e6aa34584a
|
Mark file modified even when using the context menu.
--HG--
branch : dfighter-tools
|
2014-08-27 20:25:30 +02:00 |
|
dfighter1985
|
0ae8fbde29
|
Implemented rename context menu.
--HG--
branch : dfighter-tools
|
2014-08-27 20:24:05 +02:00 |
|
dfighter1985
|
77a21cfc99
|
Now logging changes.
--HG--
branch : dfighter-tools
|
2014-08-27 19:22:10 +02:00 |
|
dfighter1985
|
3c0e76e78b
|
Load log into the log tab.
--HG--
branch : dfighter-tools
|
2014-08-27 17:37:53 +02:00 |
|
dfighter1985
|
f0fdd41675
|
Don't disable the log tab!
--HG--
branch : dfighter-tools
|
2014-08-27 17:34:26 +02:00 |
|
dfighter1985
|
5bb3e16ca4
|
Implement 'delete array entry' context menu command.
--HG--
branch : dfighter-tools
|
2014-08-27 16:23:16 +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 |
|
dfighter1985
|
6fb9c35d84
|
Implemented 'append array entry' context menu
--HG--
branch : dfighter-tools
|
2014-08-27 01:14:49 +02:00 |
|
kaetemi
|
4402e2134c
|
Remove warnings, ref #177
|
2014-08-26 13:48:34 +02:00 |
|
kaetemi
|
031cd3b68d
|
Adjust casts, ref #177
|
2014-08-26 13:33:18 +02:00 |
|
kaetemi
|
2a27139594
|
Inventory bug workaround, ref #177
|
2014-08-25 15:32:00 +02:00 |
|
kaetemi
|
573fb44088
|
Link group_wheel.cpp, ref #176
|
2014-08-25 14:56:29 +02:00 |
|
dfighter1985
|
d593ef5d17
|
Crash fixes related to Georges array size changing.
--HG--
branch : dfighter-tools
|
2014-08-20 23:36:53 +02:00 |
|
dfighter1985
|
eeac53ebba
|
Added support for creating arrays.
--HG--
branch : dfighter-tools
|
2014-08-20 23:18:16 +02:00 |
|
dfighter1985
|
d046a970d9
|
Initialize CFormItem fields...
--HG--
branch : dfighter-tools
|
2014-08-20 19:57:16 +02:00 |
|
dfighter1985
|
655d446151
|
When reaching 0 array size, delete the array node.
--HG--
branch : dfighter-tools
|
2014-08-20 18:22:20 +02:00 |
|
kaetemi
|
da5558d50a
|
Merge with default
--HG--
branch : multipass-stereo
|
2014-08-19 15:43:49 +02:00 |
|
kaetemi
|
46aa5cef29
|
EOL
|
2014-08-19 15:42:42 +02:00 |
|
kaetemi
|
02e8f6e956
|
EOL
|
2014-08-19 15:38:16 +02:00 |
|
kaetemi
|
8fab3ccce1
|
EOL
|
2014-08-19 15:37:31 +02:00 |
|
dfighter1985
|
9b6ff808c5
|
Save from the file menu too.
--HG--
branch : dfighter-tools
|
2014-08-19 01:57:20 +02:00 |
|
dfighter1985
|
a810b29ec7
|
Merged default.
--HG--
branch : gsoc2014-dfighter
|
2014-08-19 00:33:03 +02:00 |
|
kaetemi
|
5dd07248a1
|
Merge
|
2014-08-18 21:14:27 +02:00 |
|
kaetemi
|
683a0adc60
|
Crashfix in case pacs_prim are exported into .ig
|
2014-08-18 20:23:27 +02:00 |
|
dfighter1985
|
0b44c8a7a0
|
Save changes.
--HG--
branch : gsoc2014-dfighter
|
2014-08-18 19:49:32 +02:00 |
|
shubham_meena
|
d75473f567
|
documentation for doxygen containing plugin management system
|
2014-08-18 21:43:24 +05:30 |
|
dfighter1985
|
827faaf3e7
|
Array resize.
--HG--
branch : gsoc2014-dfighter
|
2014-08-18 18:03:48 +02:00 |
|
Matthew Lagoe
|
941c2e3220
|
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
|
c9f54c3806
|
Improved documentation with doxygen generated doc
|
2014-08-18 07:13:15 +05:30 |
|
dfighter1985
|
6000fe187f
|
Moved BrowserCtrlPvt to it's own files.
--HG--
branch : gsoc2014-dfighter
|
2014-08-18 01:50:07 +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 |
|
dfighter1985
|
fb5ce7baac
|
Use the string 'array size' as the name for the property holding the array size.
--HG--
branch : gsoc2014-dfighter
|
2014-08-16 03:46:52 +02:00 |
|
dfighter1985
|
6d074bc618
|
Only add atoms to the property browser..
--HG--
branch : gsoc2014-dfighter
|
2014-08-16 03:10:50 +02:00 |
|
dfighter1985
|
2a0af6cabf
|
Only add atoms to the property browser..
--HG--
branch : gsoc2014-dfighter
|
2014-08-16 02:51:30 +02:00 |
|
dfighter1985
|
99502a1bfc
|
Handle selected arrays too ( show size, changing it isn't implemented yet ).
--HG--
branch : gsoc2014-dfighter
|
2014-08-16 02:47:29 +02:00 |
|
dfighter1985
|
5812058ea6
|
Only add atoms to the property browser.
--HG--
branch : gsoc2014-dfighter
|
2014-08-16 02:01:07 +02:00 |
|
dfighter1985
|
c740d5a773
|
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.
--HG--
branch : gsoc2014-dfighter
|
2014-08-15 23:49:12 +02:00 |
|
botanic
|
64fafda9bc
|
updated hgignore
|
2014-08-15 03:55:49 -07:00 |
|
botanic
|
4b871c43f5
|
updated doxygen
|
2014-08-15 03:49:39 -07:00 |
|
shubham_meena
|
2a2c2b1d67
|
Merged in Gsoc14-ryzomAppImprovements (pull request #1)
Merging Gsoc 14 branch with default
|
2014-08-15 01:05:39 +05:30 |
|
shubham_meena
|
ee6db8ef7f
|
code modified to accept request through Rest and sending achievments in response
--HG--
branch : Gsoc14-ryzomAppImprovements
|
2014-08-15 00:24:31 +05:30 |
|
shubham_meena
|
a01e331639
|
bug fix in plugin installation
--HG--
branch : Gsoc14-ryzomAppImprovements
|
2014-08-15 00:13:00 +05:30 |
|
shubham_meena
|
750ded21bd
|
added option for posting data in REST api
--HG--
branch : Gsoc14-ryzomAppImprovements
|
2014-08-14 22:25:16 +05:30 |
|
shubham_meena
|
f8a92326ed
|
BugFixes: achievements and API key management plugins
--HG--
branch : Gsoc14-ryzomAppImprovements
|
2014-08-14 22:20:05 +05:30 |
|
shubham_meena
|
5fd2615f0e
|
small bug fix: support group missing brackets at end
--HG--
branch : Gsoc14-ryzomAppImprovements
|
2014-08-13 18:32:13 +05:30 |
|
shubham_meena
|
ac980adcc7
|
Added few more options in REST api
--HG--
branch : Gsoc14-ryzomAppImprovements
|
2014-08-13 12:57:30 +05:30 |
|
kaetemi
|
993f2ffab7
|
Snowballs update
--HG--
branch : multipass-stereo
|
2014-08-12 21:11:55 +02:00 |
|
dfighter1985
|
aa95cc3c4b
|
Apply changes.
--HG--
branch : gsoc2014-dfighter
|
2014-08-12 21:00:33 +02:00 |
|
dfighter1985
|
1b7b081c60
|
Shown properties can now be edited.
--HG--
branch : gsoc2014-dfighter
|
2014-08-12 20:17:10 +02:00 |
|
dfighter1985
|
a43c2f0a5e
|
First iteration of the property browser.
--HG--
branch : gsoc2014-dfighter
|
2014-08-12 19:26:55 +02:00 |
|
shubham_meena
|
0e4b004978
|
Bug Fix: delete plugin option available for inactive plugins
--HG--
branch : Gsoc14-ryzomAppImprovements
|
2014-08-12 12:46:22 +05:30 |
|
shubham_meena
|
acb4f26f1a
|
API key management plugin for ams
--HG--
branch : Gsoc14-ryzomAppImprovements
|
2014-08-12 00:33:58 +05:30 |
|
shubham_meena
|
0d8fe2b7aa
|
Achievements plugin integrated with ams
--HG--
branch : Gsoc14-ryzomAppImprovements
|
2014-08-12 00:33:11 +05:30 |
|
shubham_meena
|
70e8310fff
|
added API key mangement and Achievements plugin during installation of ams
--HG--
branch : Gsoc14-ryzomAppImprovements
|
2014-08-12 00:23:48 +05:30 |
|
shubham_meena
|
990eae1065
|
Adding activated plugins to the main options list
--HG--
branch : Gsoc14-ryzomAppImprovements
|
2014-08-11 22:57:08 +05:30 |
|
dfighter1985
|
9315b7229e
|
Don't enter edit mode in the treeview.
--HG--
branch : gsoc2014-dfighter
|
2014-08-10 15:25:59 +02:00 |
|
kaetemi
|
93376226c4
|
Use software cursor with attached display
--HG--
branch : multipass-stereo
|
2014-08-07 19:45:26 +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 |
|
dfighter1985
|
033c86e92c
|
Add the property browser library to the CPack archive when generated.
--HG--
branch : gsoc2014-dfighter
|
2014-08-06 22:59:58 +02:00 |
|
dfighter1985
|
7f6608b897
|
World Editor plugin Linux build fix.
--HG--
branch : gsoc2014-dfighter
|
2014-08-06 22:12:46 +02:00 |
|
dfighter1985
|
475c0201ea
|
GUI Editor Linux build fix
--HG--
branch : gsoc2014-dfighter
|
2014-08-06 22:10:11 +02:00 |
|
dfighter1985
|
48bd3cb383
|
Fixed qrc path.
--HG--
branch : gsoc2014-dfighter
|
2014-08-06 19:54:01 +02:00 |
|
dfighter1985
|
50b90f9774
|
Update the tile list right away if the image is replaced.
--HG--
branch : gsoc2014-dfighter
|
2014-08-06 17:40:39 +02:00 |
|
dfighter1985
|
20edb57761
|
If I add a 256x256 tile, maybe I should remove it as 256x256, not 128x128...
--HG--
branch : gsoc2014-dfighter
|
2014-08-06 17:14:59 +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 |
|
dfighter1985
|
9bb62a3ada
|
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.
--HG--
branch : gsoc2014-dfighter
|
2014-08-06 13:25:50 +02:00 |
|
dfighter1985
|
669c15eda9
|
Removed yet another unused variable.
--HG--
branch : gsoc2014-dfighter
|
2014-08-06 13:04:30 +02:00 |
|
dfighter1985
|
e7ded1f82c
|
Removed unused variable.
--HG--
branch : gsoc2014-dfighter
|
2014-08-06 13:01:44 +02:00 |
|
kaetemi
|
e8a245a133
|
OVR: Chroma factor
--HG--
branch : multipass-stereo
|
2014-08-05 20:14:58 +02:00 |
|
dfighter1985
|
613643b033
|
Repaint immediately when the display channel is changed.
--HG--
branch : gsoc2014-dfighter
|
2014-08-05 16:01:45 +02:00 |
|
dfighter1985
|
edf1da1294
|
Save the last directory where we loaded a tile image from.
--HG--
branch : gsoc2014-dfighter
|
2014-08-05 15:34:29 +02:00 |
|
dfighter1985
|
04d17b7a05
|
Save the last directoy where we loaded a tilebank from.
--HG--
branch : gsoc2014-dfighter
|
2014-08-05 15:16:25 +02:00 |
|
dfighter1985
|
f25d152f4f
|
Rotation is now set in the tilebank wrapper and applied when replacing a tile.
--HG--
branch : gsoc2014-dfighter
|
2014-08-05 13:42:56 +02:00 |
|
dfighter1985
|
99bcb6cf79
|
Line endings and copyright headers...
--HG--
branch : gsoc2014-dfighter
|
2014-08-05 13:18:41 +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 |
|
dfighter1985
|
e2a579c03e
|
Set all images by default.
--HG--
branch : gsoc2014-dfighter
|
2014-08-05 03:35:10 +02:00 |
|
dfighter1985
|
84fc5f27b6
|
Clear before loading the model data.
--HG--
branch : gsoc2014-dfighter
|
2014-08-05 03:20:30 +02:00 |
|
dfighter1985
|
2a55904b3e
|
Makes no sense, but doesn't seem to be crashing anymore o.O
--HG--
branch : gsoc2014-dfighter
|
2014-08-05 03:17:29 +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 |
|
dfighter1985
|
8bead3f3fd
|
Saving tilebank
--HG--
branch : gsoc2014-dfighter
|
2014-08-04 22:14:39 +02:00 |
|
dfighter1985
|
92e850d296
|
Texture path.
--HG--
branch : gsoc2014-dfighter
|
2014-08-04 21:59:05 +02:00 |
|
dfighter1985
|
bdedd145e4
|
Surface data.
--HG--
branch : gsoc2014-dfighter
|
2014-08-04 21:53:22 +02:00 |
|
dfighter1985
|
55c046252f
|
Oriented stuff.
--HG--
branch : gsoc2014-dfighter
|
2014-08-04 21:41:33 +02:00 |
|
dfighter1985
|
688f6de090
|
Vegetation set stuff.
--HG--
branch : gsoc2014-dfighter
|
2014-08-04 21:33:11 +02:00 |
|
dfighter1985
|
caf76f09c8
|
Most of the functionality works with the new code.
--HG--
branch : gsoc2014-dfighter
|
2014-08-04 21:22:44 +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 |
|
shubham_meena
|
204a5b8a18
|
rest api using curl
--HG--
branch : Gsoc14-ryzomAppImprovements
|
2014-08-04 14:05:11 +05:30 |
|
kaetemi
|
96bd17ae63
|
3D: Fix texture coords for FXAA on D3D
--HG--
branch : multipass-stereo
|
2014-08-04 07:38:40 +02:00 |
|
kaetemi
|
1a413b0fe3
|
Add FXAA to Ryzom Client
--HG--
branch : multipass-stereo
|
2014-08-04 06:19:19 +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
|
fb525e3911
|
Cleanup snowballs2
--HG--
branch : multipass-stereo
|
2014-08-04 05:24:40 +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 |
|
dfighter1985
|
299629860b
|
Rotation can now be set.
--HG--
branch : gsoc2014-dfighter
|
2014-08-03 19:04:34 +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 |
|
dfighter1985
|
49deedad7d
|
Save the tile border, etc data when saving.
--HG--
branch : gsoc2014-dfighter
|
2014-08-03 17:58:02 +02:00 |
|
dfighter1985
|
175af2fa74
|
Added checks. Yes it's horrible and needs to be refactored.
--HG--
branch : gsoc2014-dfighter
|
2014-08-03 04:15:12 +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 |
|
kaetemi
|
e4e1e3e5a1
|
Sound orientation with HMD and Headphones
--HG--
branch : multipass-stereo
|
2014-08-01 23:11:35 +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 |
|
shubham_meena
|
ce53f5f26c
|
API key management calender
--HG--
branch : Gsoc14-ryzomAppImprovements
|
2014-08-01 16:01:35 +05:30 |
|
kaetemi
|
c70d8597b2
|
Merge with default
--HG--
branch : multipass-stereo
|
2014-08-01 11:50:40 +02:00 |
|
dfighter1985
|
1a49f9fedb
|
Apply the current zoom factor!
--HG--
branch : gsoc2014-dfighter
|
2014-08-01 02:38:04 +02:00 |
|
dfighter1985
|
851afcf955
|
Don't reload the pixmaps every time they are displayed... -.-
--HG--
branch : gsoc2014-dfighter
|
2014-08-01 02:34:57 +02:00 |
|
dfighter1985
|
1265d6b064
|
Line endings...
--HG--
branch : gsoc2014-dfighter
|
2014-07-31 23:23:52 +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
|
a994f23948
|
When hitting 'save as' ask for a filename even if one is set.
--HG--
branch : gsoc2014-dfighter
|
2014-07-30 15:55:09 +02:00 |
|
dfighter1985
|
0cef115a74
|
Should store the filename after opening..
--HG--
branch : gsoc2014-dfighter
|
2014-07-30 15:44:02 +02:00 |
|
dfighter1985
|
ac643d2bb9
|
Should only add 1 tile here...
--HG--
branch : gsoc2014-dfighter
|
2014-07-30 15:40:02 +02:00 |
|
dfighter1985
|
eee43ad1ea
|
128 and 256 tiles don't have alpha, so no need to load/save them.
--HG--
branch : gsoc2014-dfighter
|
2014-07-30 15:29:50 +02:00 |
|
dfighter1985
|
4bff87ca36
|
Replace and delete image should be applied to the correct channel now.
--HG--
branch : gsoc2014-dfighter
|
2014-07-30 14:39:19 +02:00 |
|
dfighter1985
|
7b1ee54427
|
Show the image that belongs to the channel that is selected.
--HG--
branch : gsoc2014-dfighter
|
2014-07-30 14:28:17 +02:00 |
|
dfighter1985
|
4d54cca6a0
|
Copyright headers...
--HG--
branch : gsoc2014-dfighter
|
2014-07-30 11:20:29 +02:00 |
|
dfighter1985
|
ddd687325f
|
Close the loaded file and return true...
--HG--
branch : gsoc2014-dfighter
|
2014-07-30 11:15:14 +02:00 |
|
dfighter1985
|
ac73999f07
|
Set teh current selection to row 0
--HG--
branch : gsoc2014-dfighter
|
2014-07-30 11:14:41 +02:00 |
|
dfighter1985
|
3e2addc057
|
Save and load the tilebank texture path.
--HG--
branch : gsoc2014-dfighter
|
2014-07-30 11:10:15 +02:00 |
|
dfighter1985
|
0f5e475d1c
|
Save and load the veget set filename.
--HG--
branch : gsoc2014-dfighter
|
2014-07-30 10:58:37 +02:00 |
|
dfighter1985
|
431178321f
|
TileBank loading.
--HG--
branch : gsoc2014-dfighter
|
2014-07-30 10:54:08 +02:00 |
|
dfighter1985
|
c8914248db
|
Add the already selected tilesets to the land when editing.
--HG--
branch : gsoc2014-dfighter
|
2014-07-30 07:43:02 +02:00 |
|
dfighter1985
|
ddc7961e9b
|
Connected the oriented combobox and now saving it's value to the tilebank.
--HG--
branch : gsoc2014-dfighter
|
2014-07-30 01:50:01 +02:00 |
|