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
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
dfighter1985
|
cc12fb91b4
|
Tile loading more or less works. TODO: investigate why displacement map lookup causes crashes.
|
2014-08-05 02:58:31 +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 |
|
shubham_meena
|
a313d66c89
|
rest api using curl
|
2014-08-04 14:05:11 +05:30 |
|
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 |
|
dfighter1985
|
df4446701e
|
Rotation can now be set.
|
2014-08-03 19:04:34 +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 |
|