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 |
|