dfighter1985
e311547a39
Initialize Nel3D in the Object Viewer plugin too.
...
--HG--
branch : hotfix
2015-02-01 20:29:26 +01:00
kervala
6205b16fbf
Changed: Optimize sorting of files (instead of doing it several times for each directory, do it only once)
...
--HG--
branch : develop
2015-01-23 21:11:15 +01:00
kervala
eea09d8893
Fixed: Guilds with same characters and not same spaces
...
--HG--
branch : develop
2015-01-21 13:20:56 +01:00
Nimetu
53f6adb041
Include chat message channel/type to chatlog file
...
--HG--
branch : issue-221
2015-01-15 20:08:28 +02:00
kervala
b26e7f4c1b
Fixed: Compilation
...
--HG--
branch : develop
2015-01-13 20:35:34 +01:00
kervala
3aa448ba24
Changed: Replaced atoi and atof by NLMISC::fromString
...
--HG--
branch : develop
2015-01-13 19:47:14 +01:00
kervala
b70e8d3e7b
Fixed: Compilation
...
--HG--
branch : develop
2015-01-13 15:15:07 +01:00
kervala
5ee2864491
Fixed: Compilation
...
--HG--
branch : develop
2015-01-13 15:08:13 +01:00
kervala
303f7d2e79
Changed: Minor changes
...
--HG--
branch : develop
2015-01-13 14:11:07 +01:00
kervala
704610668d
Changed: Replaced ~0 by corresponding std::numeric_limits<T>::max()
...
--HG--
branch : develop
2015-01-13 13:47:19 +01:00
kaetemi
dade81e02e
Lightmap debug message
...
--HG--
branch : develop
2015-01-13 13:21:56 +01:00
kaetemi
1ab170b7d8
Unhide layers in max export
...
--HG--
branch : develop
2015-01-13 13:21:56 +01:00
kervala
bc78734602
Changed: Fixed a wrong copy-paste
...
--HG--
branch : develop
2015-01-11 18:27:06 +01:00
kervala
8fc8c3aa39
Changed: Use defined directories prefixed by a default directory
...
--HG--
branch : develop
2015-01-11 18:01:32 +01:00
kervala
08c557ae76
Changed: Allow to use a readable and writable data path for IG patch (usefull when data are read only)
...
--HG--
branch : develop
2015-01-11 15:06:02 +01:00
kervala
3367eb3205
Changed: Append getAppBundlePath() to search paths under OS X
...
--HG--
branch : develop
2015-01-11 14:59:15 +01:00
kervala
acf677e635
Changed: Don't use replaceApplicationDirToken anymore
...
--HG--
branch : develop
2015-01-11 14:57:40 +01:00
kervala
3bca3f41cc
Changed: Typo
...
--HG--
branch : develop
2015-01-11 14:56:51 +01:00
kervala
fad0e9af4e
Fixed: Compilation with OS X SDK 10.10
...
--HG--
branch : develop
2015-01-10 20:33:02 +01:00
kervala
e8ff07fe7d
Fixed: Removed raw mouse mode for OS X too
...
--HG--
branch : develop
2015-01-10 19:55:05 +01:00
kervala
5b9ac59f49
Fixed: OpenGL driver compilation
...
--HG--
branch : develop
2015-01-10 19:53:27 +01:00
kervala
418e0ee7b7
Merge
...
--HG--
branch : develop
2015-01-10 19:08:55 +01:00
kervala
99c88bd515
Changed: Minor changes
...
--HG--
branch : develop
2015-01-10 18:45:14 +01:00
kervala
2869d5f1ac
Fixed: OpenGL ES driver compilation
...
--HG--
branch : develop
2015-01-10 18:41:54 +01:00
kervala
0f22ea7777
Changed: More aliases for OpenGL ES functions and defines to simplify code
...
--HG--
branch : develop
2015-01-10 18:41:18 +01:00
Jan Boon
d360f78a1c
Merged in nimetu/ryzomcore/fix-issue-225 (pull request #98 )
...
CGroupEditBox: ignore enter key when ctrl is pressed (ctrl+m combo) (issue #225 )
--HG--
branch : develop
2015-01-09 18:09:17 +01:00
Nimetu
85f63b7db3
Fix html submit button value that is included with form data (issue #226 )
...
--HG--
branch : fix-issue-226
2015-01-09 13:11:20 +02:00
Nimetu
fbea1d2173
CGroupEditBox: ignore enter key when ctrl is pressed (ctrl+m combo) (issue #225 )
...
--HG--
branch : fix-issue-225
2015-01-09 12:59:53 +02:00
kervala
4fc639671c
Changed: Check for string length
...
--HG--
branch : develop
2014-12-26 13:44:35 +01:00
kervala
ec12e6a75e
Changed: Allow to enable UAC for Windows client
...
--HG--
branch : develop
2014-12-26 13:44:03 +01:00
kervala
f745f82455
Changed: Give priority to Luabind library filenames with specific Lua version
...
--HG--
branch : develop
2014-12-26 13:43:20 +01:00
kervala
6596af9682
Changed: Minor changes
...
--HG--
branch : develop
2014-12-26 13:38:02 +01:00
kervala
3bfcd8644d
Changed: Minor changes
...
--HG--
branch : develop
2014-12-26 13:12:56 +01:00
kaetemi
0a7462f7e1
Merge with hotfix
...
--HG--
branch : develop
2014-12-22 16:40:12 +01:00
kaetemi
bb8eb7dcec
Fix mirror type sizes
...
--HG--
branch : hotfix
2014-12-22 16:39:54 +01:00
kaetemi
c03c0f532b
Merge with default
...
--HG--
branch : develop
2014-12-22 14:26:26 +01:00
kaetemi
79b6fcae28
Merge with default
...
--HG--
branch : compatibility
2014-12-22 14:24:13 +01:00
kaetemi
f9c81f3740
ryzomcore/v0.11.2
...
--HG--
branch : hotfix
2014-12-22 14:21:01 +01:00
kaetemi
2095646575
Move to hotfix: 9878ab4ebe5e
...
--HG--
branch : compatibility
2014-12-22 14:15:38 +01:00
kaetemi
11ae94ab21
Move to feature-light_cycle: c5207e1f862a
...
--HG--
branch : develop
2014-12-22 14:10:37 +01:00
kaetemi
b9d372b144
Backed out changeset: 3694176c26bf
...
--HG--
branch : develop
2014-12-22 14:08:54 +01:00
kaetemi
a43fb4dba8
Move to hotfix: 287c1142e5ea
...
--HG--
branch : develop
2014-12-22 14:08:29 +01:00
dfighter1985
f189a98422
Ported changeset 9878ab4: CCtrlTextbutton checkcoords should call it's text's checkcoords method. Fix #219 .
...
--HG--
branch : develop
2014-12-22 01:26:04 +01:00
dfighter1985
4d67a41f94
CCtrlTextbutton checkcoords should call it's text's checkcoords method. Fix #219 .
...
--HG--
branch : hotfix
2014-12-21 22:55:27 +01:00
dfighter1985
d62f7a21a7
CCtrlTextbutton checkcoords should call it's text's checkcoords method. Fix #219 .
...
--HG--
branch : compatibility
2014-12-21 22:55:27 +01:00
kaetemi
93d5ffddb6
Override sun direction from sky dome [breaks packed sheets]
...
--HG--
branch : develop
2014-12-12 21:17:13 +01:00
kaetemi
eb2f4555b1
Also export non-root shapes
...
--HG--
branch : develop
2014-12-12 21:17:13 +01:00
kaetemi
5346da559e
Merge
...
--HG--
branch : develop
2014-12-12 01:24:56 +01:00
kaetemi
0c77c91e95
Adjust sky batch
...
--HG--
branch : develop
2014-12-12 01:22:19 +01:00
kaetemi
c3df884b13
Allow different light cycle for different continents [breaks packed sheets]
...
--HG--
branch : develop
2014-12-12 01:22:19 +01:00
kaetemi
44286f7ade
Add sky batch script
...
--HG--
branch : develop
2014-12-12 01:22:18 +01:00
kaetemi
f411d2b230
Fix choppy sky animation
...
--HG--
branch : develop
2014-12-12 01:22:18 +01:00
kaetemi
7fbe24f27f
Merge
...
--HG--
branch : develop
2014-12-09 23:10:27 +01:00
kaetemi
7cb61f8796
Merge
...
--HG--
branch : develop
2014-12-09 23:07:58 +01:00
kaetemi
da166c81db
Add zone snapshot script example
...
--HG--
branch : develop
2014-12-09 23:06:08 +01:00
kaetemi
4c4b96bcfd
Fix NeLLigoMakeSnapShot
...
--HG--
branch : develop
2014-12-09 23:06:08 +01:00
kaetemi
58590a9e7e
Fix offscreen rendering mode
...
--HG--
branch : develop
2014-12-09 23:06:08 +01:00
kaetemi
6db29c375a
Add script to generate zone names
...
--HG--
branch : develop
2014-12-09 23:06:07 +01:00
kaetemi
56339c6f93
Handle window close message in painter
...
--HG--
branch : develop
2014-12-09 23:06:07 +01:00
botanicvelious
1df52a45ad
add some additional checking for database errors
...
--HG--
branch : develop
2014-12-07 06:42:57 -08:00
botanicvelious
a79e141193
Update with added Domain_Auto_Add settings
...
--HG--
branch : develop
2014-12-07 05:01:05 -08:00
kaetemi
07286c14d1
Adjust patch orientation script
...
--HG--
branch : develop
2014-12-04 13:28:30 +01:00
kaetemi
90f1234ed0
Add key in patch painter to reset a patch mesh
...
--HG--
branch : develop
2014-12-04 13:21:45 +01:00
kaetemi
b762356a16
Merge with hotfix
...
--HG--
branch : develop
2014-12-04 13:21:40 +01:00
kaetemi
59a5cb7e6b
Fix crash with patch mesh attach
...
--HG--
branch : hotfix
2014-12-04 13:21:12 +01:00
kaetemi
39c776ec30
Add script to orient zone patches automatically
...
--HG--
branch : develop
2014-12-03 15:16:39 +01:00
kaetemi
ff283f5070
Increase patch painter distance
...
--HG--
branch : develop
2014-12-03 15:16:39 +01:00
kaetemi
dfe0b2977a
Separate version string
...
--HG--
branch : develop
2014-11-24 16:07:17 +01:00
kaetemi
7bdf719cb9
Adjust version
...
--HG--
branch : develop
2014-11-24 15:04:53 +01:00
kaetemi
91a4207f93
Merge with hotfix
...
--HG--
branch : develop
2014-11-24 15:04:16 +01:00
kaetemi
358f19acae
Merge with ryzomcore/v0.11.1
...
--HG--
branch : compatibility
2014-11-24 15:03:07 +01:00
kaetemi
6b1ea30f9c
ryzomcore/v0.11.1
...
--HG--
branch : hotfix
2014-11-24 14:57:36 +01:00
kaetemi
1676b3b46f
Fix #218 erratic mouse behaviour
...
--HG--
branch : hotfix
2014-11-24 14:53:28 +01:00
kaetemi
fef6543e0c
Fix bug causing patch painter fail to open more than once
...
--HG--
branch : develop
2014-11-19 16:30:14 +01:00
kaetemi
0a765bde8c
Fix bug causing patch painter fail to open more than once
...
--HG--
branch : hotfix
2014-11-19 16:30:14 +01:00
kaetemi
f05c52aa0b
Remove PIC library
...
--HG--
branch : develop
2014-11-19 16:20:14 +01:00
kaetemi
53b3a51b54
Merge with ryzomcore/v0.11.0
...
--HG--
branch : compatibility
2014-11-10 23:47:23 +01:00
kaetemi
0c1ff0df2a
ryzomcore/v0.11.0
...
--HG--
branch : develop
2014-11-10 23:34:41 +01:00
kaetemi
2df9cb5f87
Fix PHP error "Only variables should be passed by reference"
...
--HG--
branch : develop
2014-11-08 00:29:50 +01:00
kaetemi
ef2415257b
Fix PHP error "Only variables should be passed by reference"
...
--HG--
branch : develop
2014-11-07 23:51:42 +01:00
kaetemi
70ace8b7d4
Print callstack
...
--HG--
branch : develop
2014-11-07 23:37:39 +01:00
kaetemi
91ad193104
Fix patchman scripts
...
--HG--
branch : develop
2014-11-07 19:32:18 +01:00
kaetemi
ee92cb0702
Update default path
...
--HG--
branch : develop
2014-11-07 19:21:05 +01:00
kaetemi
d30cca34f0
Backed out merge changeset: 361eb082ec5e
...
Does not compile. FindLibLZMA missing on Ubunty 12.04 LTS
--HG--
branch : develop
2014-11-07 19:17:43 +01:00
kaetemi
c3cf5c7af4
Update default patchman cfg
...
--HG--
branch : develop
2014-11-07 19:16:45 +01:00
kaetemi
933420690b
Change patchman example domain
...
--HG--
branch : develop
2014-11-07 19:02:50 +01:00
dfighter1985
0ac94e3e72
CDBViewQuantity shouldn't crash in the editor.
...
--HG--
branch : dfighter-tools
2014-10-20 22:49:46 +02:00
dfighter1985
d2ca66c574
Default text for DBViewNumber.
...
--HG--
branch : dfighter-tools
2014-10-20 22:27:33 +02:00
dfighter1985
8c5ad81199
it's not a bad idea to store the value in the right variable...
...
--HG--
branch : dfighter-tools
2014-10-20 22:21:59 +02:00
dfighter1985
b6d9e3285f
DBViewNumber shouldn't crash anymore.
...
--HG--
branch : dfighter-tools
2014-10-20 20:57:08 +02:00
dfighter1985
2fe2077170
When setting the Id of the decorated edit box, set the Id of the text as well.
...
--HG--
branch : dfighter-tools
2014-10-20 18:51:53 +02:00
Jan Boon
e2eb5d739c
Merged in nimetu/ryzomcore/html-table-rendering (pull request #92 )
...
Some improvements to table rendering
--HG--
branch : develop
2014-10-18 04:44:34 +02:00
Nimetu
78e1bb6147
Fix html img not showing on some cases, clean up addImage method
...
--HG--
branch : develop
2014-10-18 01:20:56 +03:00
Nimetu
48b346fed8
Fix crash when using textarea without form
...
--HG--
branch : develop
2014-10-18 00:15:51 +03:00
dfighter1985
67aa7a50d2
set the Id of the text properly when loading the decorated edit box.
...
--HG--
branch : dfighter-tools
2014-10-17 22:25:30 +02:00
dfighter1985
fd5a1a6834
Don't add non-selectable widgets to the hierarchy tree.
...
--HG--
branch : dfighter-tools
2014-10-17 21:23:00 +02:00
dfighter1985
923b36f0e5
Create the viewtext of the decorated edit box when the box is created, also adjust it so the text is drawn to the right of the left texture.
...
--HG--
branch : dfighter-tools
2014-10-17 21:18:26 +02:00
dfighter1985
ba1e3c9919
Fixed a typo that messed up the textures of decorated editbox.
...
--HG--
branch : dfighter-tools
2014-10-17 16:01:50 +02:00
dfighter1985
210f93a4f2
Save decorated edit box as such.
...
--HG--
branch : dfighter-tools
2014-10-16 21:03:58 +02:00
dfighter1985
18866c88af
Update decorated edit box decoration coords while dragging.
...
--HG--
branch : dfighter-tools
2014-10-16 20:58:47 +02:00
dfighter1985
274efe6798
Allow selection of CGroupEditBox.
...
--HG--
branch : dfighter-tools
2014-10-16 20:29:36 +02:00
dfighter1985
42ebad94f6
Implemented CGroupEditBoxDecor a decorated CGroupEditBox.
...
--HG--
branch : dfighter-tools
2014-10-16 20:25:19 +02:00
dfighter1985
f7f74b5398
Render every 25ms instead of 200ms
...
--HG--
branch : dfighter-tools
2014-10-15 23:30:36 +02:00
dfighter1985
66fe76fc06
A Kami will be the default texture for Bitmaps.
...
--HG--
branch : dfighter-tools
2014-10-15 20:20:44 +02:00
dfighter1985
c9b528081e
CtrlButton textures should be selectable in the texture chooser!
...
--HG--
branch : dfighter-tools
2014-10-15 20:07:13 +02:00
dfighter1985
cfa4129754
Default texture for CtrlButton.
...
--HG--
branch : dfighter-tools
2014-10-15 20:03:46 +02:00
dfighter1985
bd942ba62b
TEMPORARILY add the login texture map to new project by default.
...
--HG--
branch : dfighter-tools
2014-10-15 19:54:35 +02:00
dfighter1985
f91846c970
Fix parent pos and size parsing.
...
--HG--
branch : dfighter-tools
2014-10-15 19:46:43 +02:00
dfighter1985
3209f48daa
Don't drop the texture property just because there's no texture assigned...
...
--HG--
branch : dfighter-tools
2014-10-15 12:09:57 +02:00
Nimetu
0a1a1244ae
Change table defaults valign=middle, cellpadding=1, cellspacing=2
...
--HG--
branch : html-table-rendering
2014-10-15 00:02:38 +03:00
Nimetu
799705b7ed
Render table with rowspan, colspan.
...
Borders, if enabled, adds +1 to cell padding.
--HG--
branch : html-table-rendering
2014-10-14 15:29:06 +03:00
Nimetu
a53b9305a2
Add rowspan and colspan attributes
...
--HG--
branch : html-table-rendering
2014-10-14 15:26:14 +03:00
dfighter1985
2b5898565f
Don't disable the active group before serializing.
...
--HG--
branch : dfighter-tools
2014-10-13 20:15:41 +02:00
dfighter1985
ab76b7ed85
It's not a bad idea to actually retrieve the version if we load it...
...
--HG--
branch : dfighter-tools
2014-10-13 19:15:59 +02:00
dfighter1985
fae1e39039
Don't reject an action property just because it's empty...
...
--HG--
branch : dfighter-tools
2014-10-13 18:55:17 +02:00
dfighter1985
22a1d39ac7
Map files can now be specified when creating a new GUI project.
...
--HG--
branch : dfighter-tools
2014-10-13 18:53:26 +02:00
dfighter1985
c5cd6990fe
When creating a new GUI set the base color to white.
...
--HG--
branch : dfighter-tools
2014-10-13 17:47:42 +02:00
dfighter1985
8066717aa2
Pos and Size parent setters should now use the widget directly as well.
...
--HG--
branch : dfighter-tools
2014-10-13 15:43:10 +02:00
dfighter1985
2dd6278771
Size parent is now queried directly from the widget.
...
--HG--
branch : dfighter-tools
2014-10-13 15:26:47 +02:00
Nimetu
11927cca93
Render table and cell borders
...
--HG--
branch : html-table-rendering
2014-10-13 01:59:20 +03:00
Nimetu
283cbe8092
Add bordercolor attribute to table tag
...
--HG--
branch : html-table-rendering
2014-10-13 01:10:46 +03:00
dfighter1985
487c6a3440
GUI Editor should show the right parent position.
...
--HG--
branch : dfighter-tools
2014-10-12 23:07:08 +02:00
dfighter1985
b3dd26e01c
Parent positions should now be saved right again.
...
--HG--
branch : dfighter-tools
2014-10-12 23:05:22 +02:00
dfighter1985
b587acb135
Some refactoring regarding saving.
...
--HG--
branch : dfighter-tools
2014-10-12 21:15:13 +02:00
dfighter1985
2c5617cea7
When creating a new project, save it right away.
...
--HG--
branch : dfighter-tools
2014-10-12 20:09:42 +02:00
Nimetu
2de4315027
Fix table cellpadding
...
--HG--
branch : html-table-rendering
2014-10-12 17:43:18 +03:00
dfighter1985
ded18b266c
Implemented new action.
...
--HG--
branch : dfighter-tools
2014-10-11 21:43:28 +02:00
dfighter1985
e5d2e9293d
Moved CRootGroup out of CInterfaceParser.
...
--HG--
branch : dfighter-tools
2014-10-11 19:30:30 +02:00
dfighter1985
03c041310e
Added dialog for the new GUI action.
...
--HG--
branch : dfighter-tools
2014-10-11 18:56:24 +02:00
dfighter1985
5217b38f58
Some defaults.
...
--HG--
branch : dfighter-tools
2014-10-11 16:47:39 +02:00
dfighter1985
816e89c967
Another classname.
...
--HG--
branch : dfighter-tools
2014-10-11 16:40:41 +02:00
dfighter1985
7e16e95c35
CInterfaceParser in editor mode should look for files in the working directory first.
...
--HG--
branch : dfighter-tools
2014-10-11 16:26:38 +02:00
dfighter1985
99a3b93703
Restored lost class names
...
--HG--
branch : dfighter-tools
2014-10-11 14:44:16 +02:00
dfighter1985
fe89e8f77c
Added limits to pch, should fix Linux build.
...
--HG--
branch : dfighter-tools
2014-10-11 13:04:03 +02:00
dfighter1985
481298b9f1
Merged develop
...
--HG--
branch : dfighter-tools
2014-10-11 02:15:07 +02:00
dfighter1985
7b45a05562
Added support for grouping widgets.
...
--HG--
branch : dfighter-tools
2014-10-11 00:42:43 +02:00
dfighter1985
aac2fd41a1
Allow multiselection.
...
--HG--
branch : dfighter-tools
2014-10-10 20:25:25 +02:00
dfighter1985
8cec8de3a0
Unselect selection when clicking 'nothing'.
...
--HG--
branch : dfighter-tools
2014-10-10 17:33:57 +02:00
kervala
e34ba83f26
Minor changes
...
--HG--
branch : develop
2014-10-10 13:08:14 +02:00
kervala
aaa044203e
Fix some warnings
...
--HG--
branch : develop
2014-10-10 13:07:54 +02:00
kaetemi
5fd4f96a59
Configure shadow outline in applications
...
--HG--
branch : develop
2014-10-08 23:20:35 +02:00
kaetemi
74827a1808
Handle shadow outline in gui
...
--HG--
branch : develop
2014-10-08 23:20:35 +02:00
kaetemi
3edfd56c75
Implement text shade outline
...
--HG--
branch : develop
2014-10-08 23:20:34 +02:00
dfighter1985
a1e2c5667a
A little crash fix.
...
--HG--
branch : dfighter-tools
2014-10-08 21:28:20 +02:00
dfighter1985
bec078af25
Sizes should remain the same when ungrouping.
...
--HG--
branch : dfighter-tools
2014-10-08 21:00:56 +02:00
dfighter1985
3ffe56b862
Added support for ungrouping.
...
--HG--
branch : dfighter-tools
2014-10-08 20:36:16 +02:00
dfighter1985
d7d62e690c
Make group selection optional.
...
--HG--
branch : dfighter-tools
2014-10-08 18:45:17 +02:00
dfighter1985
08b6675b3d
Only select a group first in editor mode.
...
--HG--
branch : dfighter-tools
2014-10-08 18:00:54 +02:00
dfighter1985
ad9e9839fb
Don't try to handle the right mouse button actions in editor mode.
...
--HG--
branch : dfighter-tools
2014-10-08 17:59:39 +02:00
dfighter1985
64571abd47
When moving a group draw it's children too.
...
--HG--
branch : dfighter-tools
2014-10-08 17:52:56 +02:00
dfighter1985
5d5bf860d4
Reparent items in widget hierarchy instead of deleting and creating a new item...
...
--HG--
branch : dfighter-tools
2014-10-08 17:42:18 +02:00
dfighter1985
97ddd3573d
Select groups first.
...
--HG--
branch : dfighter-tools
2014-10-08 17:37:05 +02:00
kaetemi
dc3238b111
Disable dumb loading strings
...
--HG--
branch : develop
2014-10-08 09:31:45 +02:00
kaetemi
ec68d2c317
Fix rendering of specially sized window highlights
...
--HG--
branch : develop
2014-10-08 09:31:13 +02:00
kaetemi
ec6ea26323
Fix when tx_b and tx_b_open have different heights
...
--HG--
branch : develop
2014-10-08 09:30:59 +02:00
kaetemi
025d7b6260
Fix crypt
...
--HG--
branch : sha512-auth
2014-10-07 03:00:34 +02:00
kaetemi
e6c0c70fc9
Compile fixes
...
--HG--
branch : sha512-auth
2014-10-07 01:44:43 +02:00
kaetemi
650dba5c51
Require setup upgrade
...
--HG--
branch : sha512-auth
2014-10-07 01:20:57 +02:00
kaetemi
f900f80b36
Merge with develop
...
--HG--
branch : sha512-auth
2014-10-07 01:15:35 +02:00
Jan Boon
944b048356
Merged in rodolphe_breard/ryzomcore/sha512-auth (pull request #89 )
...
ref #206 : windows compilation stuff
--HG--
branch : sha512-auth
2014-10-07 01:14:31 +02:00
kaetemi
b98c6f6a59
Set version
...
--HG--
branch : develop
2014-10-07 01:14:03 +02:00
kaetemi
88a9a809a9
Add inset_t parameter to layer options, allows putting header graphics in top texture
...
--HG--
branch : develop
2014-10-04 01:43:27 +02:00
kaetemi
25f1aa6247
Fix a bad copy paste in NLGUI
...
--HG--
branch : develop
2014-10-04 01:43:13 +02:00
Rodolphe Breard
4c2be7ea1f
ref #206 : hacking the types so it may compile on windows
...
--HG--
branch : sha512-auth
2014-10-02 19:14:25 +02:00
Rodolphe Breard
81d5294fc3
ref #206 : removing unused crypt lib reference
...
--HG--
branch : sha512-auth
2014-10-02 18:21:56 +02:00
kaetemi
bb9d0d91d3
Fix #207 , FXAA orientation under D3D
...
--HG--
branch : develop
2014-10-01 23:24:56 +02:00
kaetemi
ff7450a22e
Merge with develop
...
--HG--
branch : sha512-auth
2014-10-01 23:23:06 +02:00
Jan Boon
7549ab8b7f
Merged in rodolphe_breard/ryzomcore/sha512-auth (pull request #88 )
...
rolling back to include a crypt(3) implementation and adding sha512 support
--HG--
branch : sha512-auth
2014-10-01 23:20:52 +02:00
Jan Boon
7729c3b65c
Merged in nimetu/ryzomcore-2/nimetu/find-lua-version-for-luabind-under-fedor-1412076128442 (pull request #87 )
...
find lua version for luabind under fedora
--HG--
branch : develop
2014-10-01 23:19:21 +02:00
Jan Boon
782f08f137
Merged in nimetu/ryzomcore-1/nimetu/static-libxml2-under-linux-requires-lzma-1412075714030 (pull request #86 )
...
static libxml2 under linux requires lzma (tested on fedora/debian)
--HG--
branch : develop
2014-10-01 23:19:04 +02:00
Jan Boon
980b855de9
Merged in nimetu/ryzomcore/html-maxlength-attr (pull request #84 )
...
Add maxlength attribute to input and textarea tags
--HG--
branch : develop
2014-10-01 23:18:33 +02:00
Rodolphe Breard
65b902970a
ref #206 : rolling back to include a crypt(3) implementation and adding sha512 support
...
--HG--
branch : sha512-auth
2014-10-01 21:29:10 +02:00
nimetu
dcf2906b94
find lua version for luabind under fedora
...
--HG--
branch : nimetu/find-lua-version-for-luabind-under-fedor-1412076128442
2014-09-30 11:23:16 +00:00
nimetu
3e209147b0
static libxml2 under linux requires lzma (tested on fedora/debian)
...
--HG--
branch : nimetu/static-libxml2-under-linux-requires-lzma-1412075714030
2014-09-30 11:16:28 +00:00
dfighter1985
d2587df8c1
From now on dragged widgets will be re-aligned on drop. They will find the nearest hotspot of the group they are dropped into, and calculate an offset so they will align to the hotspot and yet remain where they were dropped.
...
--HG--
branch : dfighter-tools
2014-09-29 20:29:04 +02:00
dfighter1985
4571038fa6
Update CCtrlTextButton's CViewText's coords after updating it's own coords.
...
--HG--
branch : dfighter-tools
2014-09-29 17:38:24 +02:00
dfighter1985
86007c9156
Posref changes in the editor should apply...
...
--HG--
branch : dfighter-tools
2014-09-29 17:23:22 +02:00
dfighter1985
2603ad3a2b
Refactoring. Added CInterfaceFactory.
...
--HG--
branch : dfighter-tools
2014-09-27 21:48:51 +02:00
dfighter1985
22d9accae6
When moving a widget, save the reference to the hierarchy lookup map...
...
--HG--
branch : dfighter-tools
2014-09-27 20:54:44 +02:00
dfighter1985
0055e2dd91
A little refactoring.
...
--HG--
branch : dfighter-tools
2014-09-27 20:15:46 +02:00
dfighter1985
4797b150d8
Move the text too with the text button.
...
--HG--
branch : dfighter-tools
2014-09-27 19:54:19 +02:00
dfighter1985
d053bb51c2
Merged develop
...
--HG--
branch : dfighter-tools
2014-09-27 18:22:44 +02:00
dfighter1985
c6df57adf1
Initialize struct member before use...
...
--HG--
branch : develop
2014-09-27 18:20:29 +02:00
Nimetu
0d62650159
Add maxlength attribute to input and textarea tags
...
--HG--
branch : html-maxlength-attr
2014-09-27 15:55:57 +03:00
dfighter1985
0af278e50a
A little bit of refactoring.
...
--HG--
branch : dfighter-tools
2014-09-27 01:04:49 +02:00
dfighter1985
8c3702f826
Update coords when changing something.
...
--HG--
branch : dfighter-tools
2014-09-27 01:00:52 +02:00
dfighter1985
c92d084600
Merged develop.
...
--HG--
branch : dfighter-tools
2014-09-27 00:08:06 +02:00
dfighter1985
938c36027d
Editbox selection should be stopped when the mouse button goes up, even if it happens outside of the box.
...
--HG--
branch : develop
2014-09-26 23:29:38 +02:00
dfighter1985
4ec13e57e4
Collapse the tree, and only expand the items that are needed to get to the selected items.
...
--HG--
branch : dfighter-tools
2014-09-25 00:37:25 +02:00
dfighter1985
9cae0c1793
When repareting a widget, remove the old item from the hierarchy and add a new one at the right place.
...
--HG--
branch : dfighter-tools
2014-09-24 23:56:11 +02:00
dfighter1985
006f87278b
Refactored IWidgetAdditionWatcher, now it's called IWidgetWatcher and it also reports widget moves.
...
--HG--
branch : dfighter-tools
2014-09-24 23:32:24 +02:00
dfighter1985
a658be39b7
No need for free floating elements when we can simply reparent to the top window...
...
--HG--
branch : dfighter-tools
2014-09-24 22:59:40 +02:00
dfighter1985
e7ab56beea
Orphaned widgets won't get stuck.
...
--HG--
branch : dfighter-tools
2014-09-24 20:40:37 +02:00
dfighter1985
bd7cb1eea3
Add widget to a new parent when the widget being dragged is dropped, otherwise add it to the orphanlist so that it's drawn anyways. NOTE: The dropped widget can be clipped. If it is clipped, it never shows up even tho it's there.
...
--HG--
branch : dfighter-tools
2014-09-24 18:45:52 +02:00
dfighter1985
f9dbef7df7
Set dragged widgets' coordinates based on the move rather than the mouse pointer's coords.
...
--HG--
branch : dfighter-tools
2014-09-24 16:31:26 +02:00
dfighter1985
62744db86d
Dragged elements will no longer disappear.
...
--HG--
branch : dfighter-tools
2014-09-24 16:20:25 +02:00
kaetemi
3bd552ebb0
Add useful default config variables to dev client
...
--HG--
branch : develop
2014-09-24 12:34:40 +02:00
kaetemi
27cbd59a0f
Add some more practical data build batch scripts
...
--HG--
branch : develop
2014-09-24 01:07:12 +02:00
kaetemi
6551881171
Handle GUI event only once
...
--HG--
branch : develop
2014-09-23 19:47:06 +02:00
kaetemi
cb022c6bbb
Remove debug message
...
--HG--
branch : develop
2014-09-23 18:18:14 +02:00
kaetemi
e714e37c4c
Fix EGS sheet rebuild crashes
...
--HG--
branch : develop
2014-09-23 13:54:02 +02:00
dfighter1985
7ef9920bac
Instantiate the Wold Editor window after the LIGO setup.
...
--HG--
branch : dfighter-tools
2014-09-23 00:16:57 +02:00
dfighter1985
9b989a2dc0
Merged develop.
...
--HG--
branch : dfighter-tools
2014-09-22 23:58:48 +02:00
dfighter1985
e67e9594e1
Call the onActivate method of the current context after all plugins are initialized.
...
--HG--
branch : dfighter-tools
2014-09-22 23:41:55 +02:00
dfighter1985
f61438d7d9
Studio should no longer crash when multiple plugins that use LIGO are loaded. LIGO classes are now guarded against multiple registrations. If it's tried log messages are generated. Mission Compiler and World Editor will now apply their own LIGO configs when the user switches to their tab.
...
--HG--
branch : dfighter-tools
2014-09-22 23:24:48 +02:00
kaetemi
eff07ebbf9
Add an assert
...
--HG--
branch : develop
2014-09-21 13:24:33 +02:00
kaetemi
cec992c4a5
Fix double delete
...
--HG--
branch : develop
2014-09-21 12:31:02 +02:00
dfighter1985
648b2cb46b
oups
...
--HG--
branch : dfighter-tools
2014-09-20 20:55:30 +02:00
dfighter1985
5b7bc8cc54
GUI Editor should no longer crash on Linux
...
--HG--
branch : dfighter-tools
2014-09-20 20:51:08 +02:00
dfighter1985
447aac5821
Merged develop
...
--HG--
branch : dfighter-tools
2014-09-19 20:10:00 +02:00
kaetemi
779b0c22bc
Add extra search paths
...
--HG--
branch : develop
2014-09-19 19:48:17 +02:00
kaetemi
0ed6e8111b
Increment web version
...
--HG--
branch : sha512-auth
2014-09-18 21:55:34 +02:00
kaetemi
b6df4cac4f
Merge with develop
...
--HG--
branch : sha512-auth
2014-09-18 21:54:34 +02:00
kaetemi
0275d0fe29
It works on my machine
...
--HG--
branch : develop
2014-09-18 21:02:14 +02:00
kaetemi
902a873e78
Add resave scripts
...
--HG--
branch : develop
2014-09-18 17:40:07 +02:00
kaetemi
5e9c3b82fc
Add particle system path fixing script
...
--HG--
branch : develop
2014-09-18 14:10:03 +02:00
kaetemi
027860be16
Fix missing include
...
--HG--
branch : develop
2014-09-18 13:02:32 +02:00
kaetemi
c1b8ea9bd0
Backed out incomplete changes to GL driver
...
--HG--
branch : develop
2014-09-18 11:31:19 +02:00
dfighter1985
780394f989
Fixed Object Viewer build.
...
--HG--
branch : dfighter-tools
2014-09-17 22:36:58 +02:00
dfighter1985
7a4d9e2cdc
Merged the gui-editor branch.
...
--HG--
branch : dfighter-tools
2014-09-17 21:12:14 +02:00
dfighter1985
012fae0ef6
don't evaluate the child-nodes when there are none, directly just return ()
...
--HG--
branch : dfighter-tools
2014-09-17 20:54:16 +02:00
dfighter1985
4d760c7515
When removing the root node, don't retain the pointer to it...
...
--HG--
branch : dfighter-tools
2014-09-17 20:51:45 +02:00
dfighter1985
0c354f436d
Added the rest of the expression files.
...
--HG--
branch : dfighter-tools
2014-09-17 20:49:26 +02:00
dfighter1985
d90d3cd227
Merged develop.
...
--HG--
branch : dfighter-tools
2014-09-17 19:51:14 +02:00
dfighter1985
4059547835
Added support for clearing the Expression Editor scene.
...
--HG--
branch : dfighter-tools
2014-09-17 19:27:06 +02:00
dfighter1985
e77fed3c3d
Texture Chooser shouldn't have been left in the main menu...
...
--HG--
branch : dfighter-tools
2014-09-17 19:21:39 +02:00
dfighter1985
df98492b1c
Moved the Expression Editor to it's right place.
...
--HG--
branch : dfighter-tools
2014-09-17 19:19:43 +02:00
dfighter1985
a9cd538786
Instead of mouse move event, use the itemChange handler to move the links.
...
--HG--
branch : dfighter-tools
2014-09-17 16:17:41 +02:00
dfighter1985
315e43a469
ExpressionNode flags are now set in it's constructor.
...
--HG--
branch : dfighter-tools
2014-09-17 16:02:28 +02:00
dfighter1985
bf12cbc53c
Links shouldn't be selectable.
...
--HG--
branch : dfighter-tools
2014-09-17 16:01:23 +02:00
dfighter1985
b715b6eaf6
This is the GUI Editor not Georges...
...
--HG--
branch : dfighter-tools
2014-09-17 15:50:12 +02:00
dfighter1985
83859cdd82
Save expression.
...
--HG--
branch : dfighter-tools
2014-09-17 15:47:49 +02:00
dfighter1985
5f47f74431
Expression can now be built.
...
--HG--
branch : dfighter-tools
2014-09-17 15:31:54 +02:00
dfighter1985
cbca49fcc0
A root node can now be set. The root node is where the evaluation will start.
...
--HG--
branch : dfighter-tools
2014-09-17 14:41:57 +02:00
Rodolphe Breard
5c2cc95dc9
Fixing the database migration system for issue #206
...
--HG--
branch : sha512-auth
2014-09-16 22:43:36 +02:00
Rodolphe Breard
094a23bd09
fixing #206 : passwords are now stored using SHA-512 instead of traditional DES
...
--HG--
branch : sha512-auth
2014-09-16 20:34:26 +02:00
dfighter1985
cc071e5048
Added sample expression files.
...
--HG--
branch : dfighter-tools
2014-09-16 15:54:53 +02:00
dfighter1985
5e91c2f374
When changing the value of a node, change the size the node if needed.
...
--HG--
branch : dfighter-tools
2014-09-16 15:31:06 +02:00
dfighter1985
f0e78b5fbb
Allow to set and change values of value nodes.
...
--HG--
branch : dfighter-tools
2014-09-16 15:15:31 +02:00
dfighter1985
142d82d788
Only allow variable nodes to have their number of slots changed.
...
--HG--
branch : dfighter-tools
2014-09-16 03:45:26 +02:00
dfighter1985
89aaa52703
Set the number of slots and their names from the data loaded from XMLs.
...
--HG--
branch : dfighter-tools
2014-09-16 03:38:21 +02:00
dfighter1985
af74411104
Parse expression files, and build the expression tree from the expressions parsed from these files.
...
--HG--
branch : dfighter-tools
2014-09-16 02:32:10 +02:00
kaetemi
c789a22155
Fix r2ed
...
--HG--
branch : develop
2014-09-15 18:15:40 +02:00
kaetemi
74e9aac960
Fix r2ed
...
--HG--
branch : develop
2014-09-15 17:42:24 +02:00
kaetemi
9283a74a22
Fix r2ed
...
--HG--
branch : develop
2014-09-15 16:59:12 +02:00
kaetemi
84046c8db4
Fix r2ed
...
--HG--
branch : develop
2014-09-15 14:33:07 +02:00
kaetemi
07caf402c2
Fix bad type passed to sscanf
...
--HG--
branch : develop
2014-09-15 12:49:13 +02:00
dfighter1985
5e5fb49f12
Slot count can now be changed.
...
--HG--
branch : dfighter-tools
2014-09-15 01:25:01 +02:00
botanic
89604dbba4
Fix #194
...
--HG--
branch : develop
2014-09-14 15:52:40 -07:00
botanic
ba3f48a9e2
FIX #205
...
--HG--
branch : develop
2014-09-14 13:09:00 -07:00
dfighter1985
7f2091d6c9
Expression Editor is now a QMainWindow subclass. Also added an expression tree, with some sample nodes.
...
--HG--
branch : dfighter-tools
2014-09-14 21:00:40 +02:00
botanic
9ceeed138e
change to 256 characters
...
--HG--
branch : develop
2014-09-14 10:13:30 -07:00
botanic
34acdf0d94
Merge
...
--HG--
branch : develop
2014-09-14 09:46:59 -07:00
botanic
38810a8c0f
Update domain settings
...
--HG--
branch : develop
2014-09-14 09:46:12 -07:00
dfighter1985
65382b45b7
Show the node names as title, in the link dialog.
...
--HG--
branch : dfighter-tools
2014-09-14 17:19:11 +02:00
dfighter1985
eb0693cd27
Add serial number to nodes.
...
--HG--
branch : dfighter-tools
2014-09-14 17:04:42 +02:00
dfighter1985
99ebe16c03
Allow painting of arbitrary number of connection slots.
...
--HG--
branch : dfighter-tools
2014-09-14 16:57:56 +02:00
dfighter1985
40b4bce729
A little refactoring.
...
--HG--
branch : dfighter-tools
2014-09-14 16:43:45 +02:00
kaetemi
adb717052a
Add cartographer
...
--HG--
branch : develop
2014-09-14 16:37:24 +02:00
dfighter1985
42cd76c768
Support for adding nodes with different slot count.
...
--HG--
branch : dfighter-tools
2014-09-14 16:37:17 +02:00
dfighter1985
aa67011381
Added unlinking support.
...
--HG--
branch : dfighter-tools
2014-09-14 15:36:41 +02:00
dfighter1985
875cad3f72
Improved linking
...
--HG--
branch : dfighter-tools
2014-09-14 15:15:20 +02:00
kaetemi
b5a95d725b
Add pz process
...
--HG--
branch : develop
2014-09-14 15:02:44 +02:00
dfighter1985
2e6a5bb1d6
There are more than 1 slots available now.
...
--HG--
branch : dfighter-tools
2014-09-13 23:54:25 +02:00
dfighter1985
275095107b
More refactoring.
...
--HG--
branch : dfighter-tools
2014-09-13 22:54:50 +02:00
dfighter1985
5fc392623b
More refactoring.
...
--HG--
branch : dfighter-tools
2014-09-13 22:39:00 +02:00
dfighter1985
c63f22fe92
Refactoring
...
--HG--
branch : dfighter-tools
2014-09-13 22:31:48 +02:00
dfighter1985
4cf4440a97
Connection slots are now managed by their own object, and linking is now done to their positions.
...
--HG--
branch : dfighter-tools
2014-09-13 22:26:11 +02:00
botanic
07933bf52c
Update smarty for admin to 2.6.28
...
--HG--
branch : develop
2014-09-13 13:09:48 -07:00
dfighter1985
7c930366de
Paint the connection text, boxes separately.
...
--HG--
branch : dfighter-tools
2014-09-13 21:34:47 +02:00
botanic
53ea877a50
update lib sql version
...
--HG--
branch : develop
2014-09-13 10:40:47 -07:00
botanic
3c01c5c811
disable debug mode
...
--HG--
branch : develop
2014-09-13 10:35:21 -07:00
botanic
9be68e3326
Merge
...
--HG--
branch : develop
2014-09-13 10:31:22 -07:00
botanic
9b813a5e4c
Fix #122
...
--HG--
branch : develop
2014-09-13 10:31:12 -07:00
botanic
765e614c23
Fix #122
...
--HG--
branch : develop
2014-09-13 10:30:58 -07:00
dfighter1985
aef69eef64
Add a little style.
...
--HG--
branch : dfighter-tools
2014-09-13 18:03:02 +02:00
kaetemi
433d83e2fc
Increase texturing limits (*4), ref #203 (TODO: Update config translations)
...
--HG--
branch : develop
2014-09-13 12:14:45 +02:00
kaetemi
7fed632c54
Fix includes
...
--HG--
branch : develop
2014-09-13 12:02:47 +02:00
kaetemi
9678b56ed5
Fix strange code
...
--HG--
branch : develop
2014-09-13 11:13:25 +02:00
kaetemi
fe4c2becf8
File name, fix #202
...
--HG--
branch : compatibility
2014-09-13 10:08:44 +02:00
dfighter1985
af550acd62
Throw an error message when trying to link nodes that are already linked.
...
--HG--
branch : dfighter-tools
2014-09-13 00:54:37 +02:00
dfighter1985
d2c396bc84
Link nodes and remove and delete the link too when deleting one of the nodes.
...
--HG--
branch : dfighter-tools
2014-09-13 00:43:00 +02:00
dfighter1985
adece7564a
Subclassed QGraphicsItem and QGraphicsItemLine.
...
--HG--
branch : dfighter-tools
2014-09-12 23:45:57 +02:00
dfighter1985
83566116d9
Added link action.
...
--HG--
branch : dfighter-tools
2014-09-12 21:01:29 +02:00
kaetemi
6bb136dca9
Change cfg name
...
--HG--
branch : develop
2014-09-12 20:33:20 +02:00
kaetemi
07ee9a4469
Add missing r2_islands_textures tool
...
--HG--
branch : develop
2014-09-12 20:29:50 +02:00
dfighter1985
e2ea5a74b8
We can select multiple items
...
--HG--
branch : dfighter-tools
2014-09-12 19:47:28 +02:00
dfighter1985
cc7e93c96e
Added GUI for expression editor.
...
--HG--
branch : dfighter-tools
2014-09-12 19:19:51 +02:00
kaetemi
d12ccf194e
Merge with develop
...
--HG--
branch : multipass-stereo
2014-09-12 15:19:12 +02:00
kaetemi
0fe2401260
Backed out changeset: eae58a811aa5
...
--HG--
branch : compatibility
2014-09-12 11:20:36 +02:00
kaetemi
04528999c8
Backed out changeset: cd8e80e4b0d6
...
--HG--
branch : compatibility
2014-09-12 11:19:33 +02:00
kaetemi
b698c10475
Merge with ryzomcore/v0.10.0
...
--HG--
branch : compatibility
2014-09-12 11:19:09 +02:00
kaetemi
e347b2a97f
ryzomcore/v0.10.0
2014-09-12 10:57:31 +02:00
kaetemi
9fd8338849
Add data_common to executables_dev batch
2014-09-12 10:50:19 +02:00
kaetemi
8a3994d95a
Replace some hardcoded urls
2014-09-12 10:49:40 +02:00
kaetemi
50f05a2bb9
Remove hardcoded urls
2014-09-12 10:42:42 +02:00
kaetemi
927ecb3dae
Remove dead code (CCharacterAchievements, CKnownBrickInfo)
2014-09-12 08:35:49 +02:00
botanic
dcd09e034b
Merge
2014-09-11 20:29:14 -07:00
botanic
92afe8e76a
FIX #200
...
dont crash when neldb is missing
2014-09-11 10:50:34 -07:00
kaetemi
2abe431675
Regenerate PLR cpp and header
2014-09-11 17:40:53 +02:00
kaetemi
14fda8a39a
Add missing leaf
2014-09-11 15:13:17 +02:00
kaetemi
47368e78f9
Remove dead code
2014-09-11 12:12:17 +02:00
kaetemi
0d7c9fd4bf
When in Rome, do as the Romans do
2014-09-11 10:36:41 +02:00
kaetemi
6b2b633fed
Merge
2014-09-11 10:01:05 +02:00
kaetemi
a9ee3c6b37
Admin web fix
2014-09-11 10:00:10 +02:00
kaetemi
1bf482adc9
Small database adjustment
2014-09-11 09:31:59 +02:00
dfighter1985
1ca2b634ee
Merged default.
...
--HG--
branch : dfighter-tools
2014-09-10 20:18:00 +02:00
dfighter1985
52963260a8
Offer to save changes when closing a dialog.
...
--HG--
branch : dfighter-tools
2014-09-10 19:59:38 +02:00
dfighter1985
09ccd8613d
When closing a dialog, remove it from the docked dialogs, and delete it.
...
--HG--
branch : dfighter-tools
2014-09-10 19:52:35 +02:00
dfighter1985
97d7fbe6e8
Allow editing of the comment section, and save comments when saving.
...
--HG--
branch : dfighter-tools
2014-09-10 19:14:26 +02:00
dfighter1985
104506a717
Raise the widget after adding.
...
--HG--
branch : dfighter-tools
2014-09-10 18:50:07 +02:00
dfighter1985
78a65459f0
WTF?
...
--HG--
branch : dfighter-tools
2014-09-10 18:49:34 +02:00
dfighter1985
7abd407bc5
oups
...
--HG--
branch : dfighter-tools
2014-09-10 18:04:55 +02:00
dfighter1985
1d028c759c
Use a file browser for setting files.
...
--HG--
branch : dfighter-tools
2014-09-10 17:59:22 +02:00
dfighter1985
946685dfac
A little refactoring
...
--HG--
branch : dfighter-tools
2014-09-10 17:02:51 +02:00
dfighter1985
c44d910434
Store the filename only in the Dfn value.
...
--HG--
branch : dfighter-tools
2014-09-10 16:44:49 +02:00
kaetemi
fceb2927f4
Add script for installing worldedit data
2014-09-10 16:38:19 +02:00
dfighter1985
e89cde4b93
Properly support color types.
...
--HG--
branch : dfighter-tools
2014-09-10 16:22:08 +02:00
kaetemi
d03c2dcfcd
Nice try
2014-09-10 16:00:13 +02:00
nimetu
1a4c2169c5
Fix #161 fix craft success rate display on client
2014-09-10 15:40:32 +02:00
nimetu
ca79af60c6
Fix #143 /muteUniverse on dyn universe channels
2014-09-10 15:38:57 +02:00
nimetu
0cd3ea8d3b
Fix #199 Studio object viewer plugin font
2014-09-10 12:19:11 +02:00
kaetemi
9e74156181
Move islands entry points to data
2014-09-10 08:25:45 +02:00
kaetemi
f5fb98764f
Remove unused mirror dataset
2014-09-10 08:18:05 +02:00
kaetemi
22fc641666
Merge
2014-09-10 05:28:14 +02:00
kaetemi
89db6c78a7
Use the correct ring database
2014-09-10 05:25:00 +02:00
botanic
cafe41fa24
FIX #192
2014-09-09 17:29:59 -07:00
botanic
74df36b179
FIX #197
...
Added default config values that should work for mail config settings in case people are lazy
2014-09-09 17:26:20 -07:00
botanic
dfdd7698c3
fix windows warnings in sync
2014-09-09 17:20:23 -07:00
dfighter1985
0587d6a687
Create vstruct node when needed.
...
--HG--
branch : dfighter-tools
2014-09-10 00:36:55 +02:00
dfighter1985
e47d480170
Instead of storing the node, store the name and the node type.
...
--HG--
branch : dfighter-tools
2014-09-10 00:28:03 +02:00
dfighter1985
53357ca9ec
Don't add Virtual Structs to the property browser!
...
--HG--
branch : dfighter-tools
2014-09-09 22:01:52 +02:00
dfighter1985
821ec6cfad
Added support for Virtual Structs.
...
--HG--
branch : dfighter-tools
2014-09-09 21:57:30 +02:00
kaetemi
328eaf592a
Use correct AES cfg
2014-09-09 18:58:05 +02:00
kaetemi
55ca1e7a2a
Crashfix
2014-09-09 15:50:12 +02:00
kaetemi
7c40248728
Bugfix
2014-09-09 12:39:35 +02:00
kaetemi
0445c3138c
Typo
2014-09-09 08:23:37 +02:00
kaetemi
a8f8fa7b63
Don't use magic numbers for the LCT
2014-09-09 08:16:44 +02:00
kaetemi
ea9cf3db93
Typo
2014-09-09 08:15:05 +02:00
kaetemi
f0ac4705d8
Cleanup the AMS theme a bit, improve layouting of user settings
2014-09-09 04:02:15 +02:00
kaetemi
d863ed8a10
Mask database connection error
2014-09-09 02:52:24 +02:00
kaetemi
7cd21d48b4
Merge
2014-09-09 02:30:24 +02:00
botanic
6a36f1f433
fix sync
2014-09-08 17:29:43 -07:00
kaetemi
be78a1cd0b
Cache PDO connections and connection failures in a single page load
2014-09-09 02:15:25 +02:00
kaetemi
c4d4587830
Disable APC page caching
2014-09-09 02:14:49 +02:00
botanic
e1c70eb423
dont cache $#1t
2014-09-08 16:23:04 -07:00
botanic
0b579f6306
attachment error checking
2014-09-08 11:59:49 -07:00
botanic
efadbb3f58
make the random generation more secure
2014-09-08 11:46:43 -07:00
botanic
6f1037f829
fix some unset warnings
2014-09-08 05:54:34 -07:00
botanic
2a8ff51169
change some div's so it looks proper
2014-09-08 05:20:28 -07:00
botanic
8be65ec64c
turn debugging off
2014-09-08 04:56:13 -07:00
botanic
32745a132b
properly display permissions
2014-09-08 04:55:05 -07:00
botanic
4f907c30e6
display the correct plugin page
2014-09-08 03:55:59 -07:00
botanic
7fc83ccd37
set template permissions
2014-09-08 03:29:30 -07:00
botanic
b20008b520
fix menu plugin display
2014-09-08 03:19:13 -07:00
botanic
c3c319944c
fix notice
2014-09-08 03:04:34 -07:00
botanic
76dc593a1c
fix plugin template
2014-09-08 03:02:11 -07:00
botanic
8d49355c9f
fix index issue
2014-09-08 02:57:09 -07:00
botanic
4009772907
Fix smarty issues
2014-09-08 02:36:38 -07:00
botanic
371f666dea
Cleanup Domain management code
2014-09-08 02:36:31 -07:00
botanic
1b9986063e
Merge
2014-09-08 02:08:26 -07:00
botanic
b58f365473
upgrade smarty to 3.1.19
2014-09-08 02:07:42 -07:00
botanic
52885f20e0
Fix for stupid loop
2014-09-08 02:05:49 -07:00
kaetemi
3e476a9376
Install fix
2014-09-08 10:42:38 +02:00
kaetemi
d651eff10b
Cleanup some RYZOMID code
2014-09-08 09:48:28 +02:00
kaetemi
3baf60ad1d
Remove dead code in game item manager
2014-09-08 09:37:14 +02:00
kaetemi
e0a1d27dc8
Bugfix in distance prioritizer
2014-09-08 09:09:42 +02:00
botanic
ab06a6ce08
remove testing errorlog
2014-09-07 23:57:31 -07:00
kaetemi
4dda4099de
Remove dead code
2014-09-08 08:04:09 +02:00
botanic
4ff51bf600
Merge
2014-09-07 22:27:32 -07:00
botanic
876afdf018
Domain management plugin updates
2014-09-07 22:26:34 -07:00
kaetemi
034c5d7982
Better use this
2014-09-08 07:16:07 +02:00
kaetemi
6031e8666d
Enable PHP APC cache for AMS smarty
2014-09-08 07:10:28 +02:00
kaetemi
7448ec51a7
Remove dead declarations in DSS
2014-09-08 05:34:14 +02:00
kaetemi
bde283e8cb
Fix SU RSM UAP SQL query
2014-09-08 05:28:09 +02:00
kaetemi
af1b9ed495
Make this extra clear
2014-09-08 01:41:33 +02:00
kaetemi
c902392de3
Enable ring database installation and upgrade in the setup script...
2014-09-08 01:35:47 +02:00
kaetemi
01735e86ad
Translation fix
2014-09-08 01:27:46 +02:00
kaetemi
58d2c8be86
Adjust plugin description
2014-09-08 00:42:07 +02:00
kaetemi
8a875b3bab
Don't put fixed row id's in insert queries for upgrades
2014-09-08 00:26:54 +02:00
kaetemi
5ec2db090d
Bugfix
2014-09-08 00:23:07 +02:00
kaetemi
795b5a9aa0
Don't write version if upgrade failed
2014-09-08 00:21:30 +02:00
kaetemi
fed7dc17ac
Bugfix
2014-09-08 00:16:36 +02:00
kaetemi
ed0f753fa9
Fix
2014-09-08 00:11:48 +02:00
kaetemi
f4956721ff
Typo
2014-09-08 00:09:12 +02:00
kaetemi
d7c1249b6b
Setup adjust
2014-09-08 00:06:13 +02:00
Dylan Geels
6a3d59f6f5
The setup was showing a error from it.
2014-09-07 13:18:32 +00:00
Dylan Geels
fc43595faf
Function split() is deprecated
2014-09-07 13:06:24 +00:00
Dylan Geels
1a1aa68ebc
Function split() is deprecated
...
--HG--
branch : Geels/join_shardphp-edited-online-with-bitbuck-1410094877054
2014-09-07 13:01:42 +00:00
botanic
d3606149e8
upgrade nel lib version
2014-09-07 05:41:35 -07:00
botanic
b89faeb75b
Merge
2014-09-07 05:40:29 -07:00
botanic
6e0c7ef5ca
setup modifications
2014-09-07 05:40:02 -07:00
botanic
3601eae39b
Initial Domain Management Plugin
2014-09-07 05:39:48 -07:00
botanic
6a47cda484
added initial domain_management plugin, also fixed potental conflicting hook names
2014-09-07 03:17:20 -07:00
kaetemi
57564a8ab0
Cleanup shard table
2014-09-07 09:10:23 +02:00
kaetemi
b0c0439b39
Change ClientApplication to DomainId in permission table
2014-09-07 08:53:10 +02:00
kaetemi
00b394603d
Cleanup some English AMS translations
2014-09-07 04:21:08 +02:00
kaetemi
70eb2d7bee
Cleanup some English AMS translations
2014-09-07 04:16:07 +02:00
kaetemi
c938c18f35
Bugfix
2014-09-07 03:51:10 +02:00
kaetemi
aebcf606ed
Bugfix
2014-09-07 03:47:55 +02:00
kaetemi
b4f4eddd12
Add login configuration
2014-09-07 03:43:00 +02:00
kaetemi
82d9103263
This might fix #193
2014-09-06 21:25:07 +02:00
kaetemi
500aa9fbfc
Syntax styling
2014-09-06 20:59:21 +02:00
kaetemi
667fa78aab
This should fix #193
2014-09-06 20:56:06 +02:00
botanic
83d9dc9f69
Merge
2014-09-05 22:24:41 -07:00
botanic
9211037a54
fix missing pcntl_fork func
2014-09-05 22:24:09 -07:00
kaetemi
6763d96992
Add more paranoia
2014-09-06 06:49:42 +02:00
kaetemi
67d5ec373e
Now really, don't execute any scripts here
2014-09-06 06:40:33 +02:00
kaetemi
186da3c0fa
Saner behaviour to show Forbidden error
2014-09-06 04:55:17 +02:00
kaetemi
d132e5ebb1
Add upgrade script
2014-09-06 04:44:08 +02:00
botanic
d34f884d32
fixed sync to be more robust
2014-09-05 19:38:53 -07:00
botanic
72711ab92e
throw error on non-writable file
2014-09-05 19:26:12 -07:00
botanic
702320a0ce
forgot $AMS_TMPDIR
2014-09-05 19:18:17 -07:00
botanic
cbabab3e80
Merge
2014-09-05 18:46:33 -07:00
botanic
afa6787100
Fix #189
2014-09-05 18:46:13 -07:00
kaetemi
3ee17121f9
Make files folder safe to use
2014-09-06 03:44:58 +02:00
kaetemi
1448007193
Make files folder safe to use
2014-09-06 03:43:31 +02:00
kaetemi
1cec88b78b
Protect shard admin auth SQL queries
2014-09-06 01:40:37 +02:00
kaetemi
07eff64df5
Fix version number
2014-09-06 00:38:20 +02:00
kaetemi
17e921c8e4
Merge
2014-09-06 00:37:29 +02:00
kaetemi
9be5bfb5d7
Create shard admin user in setup
2014-09-06 00:35:28 +02:00
dfighter1985
46e3242557
Merged default.
...
--HG--
branch : dfighter-tools
2014-09-05 22:28:11 +02:00
dfighter1985
3a94909a92
Get type info from DFN.
...
--HG--
branch : dfighter-tools
2014-09-05 21:42:14 +02:00
dfighter1985
ff0df2bf50
Added support for manipulating atoms.
...
--HG--
branch : dfighter-tools
2014-09-05 20:28:43 +02:00
dfighter1985
b63f73b1b6
Appending, resizing arrays, deleting array members should now create the proper new nodes.
...
--HG--
branch : dfighter-tools
2014-09-05 19:41:51 +02:00
dfighter1985
6233c25461
Added support for adding atoms and virtual structs in the treeview.
...
--HG--
branch : dfighter-tools
2014-09-05 18:58:47 +02:00
kervala
ff370bb49f
Changed: Code formatting
2014-09-05 15:42:53 +02:00
dfighter1985
0ac5d7c9ee
Do the same when readding items after a deletion.
...
--HG--
branch : dfighter-tools
2014-09-05 15:20:22 +02:00
dfighter1985
683efde803
Add new array entries with all their children.
...
--HG--
branch : dfighter-tools
2014-09-05 15:13:58 +02:00
botanic
ea366fcce9
Merge
2014-09-05 02:31:56 -07:00
botanic
1908d6967c
only show powered by and version when admin
2014-09-05 02:30:50 -07:00
botanic
884357c705
added version number to ams
2014-09-05 02:27:08 -07:00
kaetemi
1acf0bf3ca
Merge
2014-09-05 11:22:47 +02:00
kaetemi
9163bf4afa
Merge
2014-09-05 11:22:18 +02:00
kaetemi
98735ea86e
Validate setup password
2014-09-05 11:21:21 +02:00
botanic
ab29777062
remove unecessery printing
2014-09-05 02:21:00 -07:00
botanic
72cfe723e1
fixed some caching
2014-09-05 02:17:19 -07:00
botanic
f27cd046a0
remove errolog
2014-09-05 02:10:32 -07:00
botanic
f46de3129e
fix sync
2014-09-05 02:10:09 -07:00
kaetemi
fbee858ae9
Add basis for database upgrades
2014-09-05 11:07:25 +02:00
botanic
e99c43095e
Made filesize friendly
2014-09-05 01:30:54 -07:00
botanic
5ae905d317
remove old file
2014-09-05 01:22:39 -07:00
botanic
bd442c9854
added placeholder
2014-09-05 01:22:19 -07:00
botanic
4293518dcf
added placeholder
2014-09-05 01:21:59 -07:00
botanic
58be0a2b8e
Merge
2014-09-05 01:20:39 -07:00
botanic
8a1a88d48c
Fix #190
2014-09-05 01:20:00 -07:00
kaetemi
38a900d4f4
Alternative redirect script
2014-09-05 10:11:50 +02:00
kaetemi
e3a519fad8
Merge
2014-09-05 10:01:20 +02:00
kaetemi
8c57fb88ab
Modularize web setup
2014-09-05 09:57:06 +02:00
botanic
147fa8f403
forgot to add variable
2014-09-05 00:52:38 -07:00
botanic
37be03d51c
Fix #188
2014-09-05 00:50:07 -07:00
botanic
981e75dfdb
added new ticket_attachment table to installer properly
2014-09-04 21:34:57 -07:00
botanic
bb7c5f147b
fixed installer
2014-09-04 20:29:45 -07:00
botanic
2311731fae
Upload button setup
...
TODO: add files to database
TODO: hash folder to stick files in
2014-09-04 19:58:04 -07:00
botanic
822d255aa7
Merge
2014-09-04 17:27:29 -07:00
botanic
4ae4c1a17d
Fix #111
2014-09-04 17:26:22 -07:00
dfighter1985
8c9237a16f
Enter a log entry when creating new documents.
...
--HG--
branch : dfighter-tools
2014-09-04 15:41:17 +02:00
dfighter1985
aba33c2406
Merged default.
...
--HG--
branch : dfighter-tools
2014-09-03 20:27:01 +02:00
dfighter1985
916810c35d
Added support for creating new form documents
...
--HG--
branch : dfighter-tools
2014-09-03 19:55:46 +02:00
dfighter1985
37bbb6be32
Added support for new DFN document creation.
...
--HG--
branch : dfighter-tools
2014-09-03 19:37:49 +02:00
dfighter1985
ca127f756c
Added support for new typ document creation.
...
--HG--
branch : dfighter-tools
2014-09-03 19:28:01 +02:00
dfighter1985
22d1fe0cbc
Error messages
...
--HG--
branch : dfighter-tools
2014-09-03 19:14:32 +02:00
dfighter1985
84853839f8
A little refactoring, dialogs are now loaded using the full filepath.
...
--HG--
branch : dfighter-tools
2014-09-03 19:11:38 +02:00
dfighter1985
7206f060a7
Added GUI stub for new types/Dfns/forms.
...
--HG--
branch : dfighter-tools
2014-09-03 18:33:09 +02:00
dfighter1985
99e9a2ad76
Removed m_modified, since the base widget has a field for this.
...
--HG--
branch : dfighter-tools
2014-09-03 17:25:11 +02:00
dfighter1985
691edb41eb
Form editor should trigger the save button properly now.
...
--HG--
branch : dfighter-tools
2014-09-03 17:22:09 +02:00
dfighter1985
7e66701cba
Added missing copyright headers.
...
--HG--
branch : dfighter-tools
2014-09-03 17:12:25 +02:00
dfighter1985
b68b658f89
Log changes and save log.
...
--HG--
branch : dfighter-tools
2014-09-03 16:42:12 +02:00
dfighter1985
d289b7e030
Mark the typ dialog modified after a modification.
...
--HG--
branch : dfighter-tools
2014-09-03 16:26:52 +02:00
dfighter1985
2ee86da670
Apply changes.
...
--HG--
branch : dfighter-tools
2014-09-03 16:14:38 +02:00
dfighter1985
6e86da4c40
Load type data into the property browser.
...
--HG--
branch : dfighter-tools
2014-09-03 16:08:13 +02:00
botanic
71840e582a
fix settings width
2014-09-03 05:27:38 -07:00
botanic
c968a95734
margins in element-style...really?
2014-09-03 05:05:21 -07:00
botanic
12ccb08de2
fix #185
2014-09-03 05:00:36 -07:00
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
305a6658ec
Merge with default
...
--HG--
branch : compatibility
2014-08-30 16:22:41 +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
e489f177a0
Merge with default
...
--HG--
branch : compatibility
2014-08-27 12:43:19 +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
dcd272c81a
Merge with default
...
--HG--
branch : compatibility
2014-08-26 13:51:19 +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
0c71506129
Merge with default
...
--HG--
branch : compatibility
2014-08-25 15:33:40 +02:00
kaetemi
2a27139594
Inventory bug workaround, ref #177
2014-08-25 15:32:00 +02:00
kaetemi
dce524e19b
Merge with default
...
--HG--
branch : compatibility
2014-08-25 15:11:23 +02:00
kaetemi
fad363efb5
Merge with ryzomcore/v0.9.1
...
--HG--
branch : compatibility
2014-08-25 15:09:16 +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
dfighter1985
95b67026bf
Implemented saving of the currently stored tilebank data.
...
--HG--
branch : gsoc2014-dfighter
2014-07-30 01:29:17 +02:00
kaetemi
8e7a3b27d7
ryzomcore/v0.9.1
2014-07-29 19:21:25 +02:00
kaetemi
c461502dc7
Crash workaround in IG loading, ref #171
2014-07-31 19:50:25 +02:00
kaetemi
9061eb8389
Cleanup
2014-07-29 16:48:14 +02:00
kaetemi
f49e9c5df1
Fix Skin export interface issue, #169
2014-07-29 15:42:11 +02:00
kaetemi
a9e3804011
Add warning
2014-07-29 15:23:51 +02:00
kaetemi
7d8e803f7a
Crashfix Physique export
2014-07-29 15:23:06 +02:00
kaetemi
6b0d468240
Remove a debug assert
2014-07-29 14:39:07 +02:00
kaetemi
9f19ade30c
Bugfix
2014-07-29 14:25:28 +02:00
kaetemi
2b8e006981
Initialize object viewer viewport at correct size
2014-07-29 14:10:40 +02:00
kaetemi
617d1235d1
Compile fix
2014-07-29 14:09:08 +02:00
nimetu
0d2fc4696f
Crafted tool durability, fix #156
2014-07-28 23:51:25 +02:00
dfighter1985
89c6180144
As it turns out, tilesets can be assigned to multiple lands...
...
--HG--
branch : gsoc2014-dfighter
2014-07-28 17:05:51 +02:00
dfighter1985
8a704b7f5f
Implemented the GUI part of saving...
...
--HG--
branch : gsoc2014-dfighter
2014-07-27 20:38:08 +02:00
dfighter1985
b004bb9d01
128x128 tab should be shown by default.
...
--HG--
branch : gsoc2014-dfighter
2014-07-27 18:23:25 +02:00
dfighter1985
4326ca1df8
Implemented tile image replace.
...
--HG--
branch : gsoc2014-dfighter
2014-07-26 02:24:32 +02:00
dfighter1985
5866a61cff
Implemented tile image deletion.
...
--HG--
branch : gsoc2014-dfighter
2014-07-26 02:19:13 +02:00
dfighter1985
599ba19de2
A little refactoring.
...
--HG--
branch : gsoc2014-dfighter
2014-07-26 02:11:02 +02:00
dfighter1985
e06858f2df
Reindex tile item nodes after deleting a node.
...
--HG--
branch : gsoc2014-dfighter
2014-07-26 02:05:21 +02:00
dfighter1985
f0a67d0c2e
Implemented tile deletion.
...
--HG--
branch : gsoc2014-dfighter
2014-07-26 01:57:50 +02:00
dfighter1985
d31dfdb6e4
I must be blind...
...
--HG--
branch : gsoc2014-dfighter
2014-07-26 00:32:42 +02:00
dfighter1985
d2a414edb4
Implemented Tile addition.
...
--HG--
branch : gsoc2014-dfighter
2014-07-26 00:29:37 +02:00
shubham_meena
3b3a595903
bug fix: added template path option in .info file
...
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-07-26 00:27:57 +05:30
dfighter1985
78f4654063
Implemented tilebank texture path setting.
...
--HG--
branch : gsoc2014-dfighter
2014-07-24 23:41:42 +02:00
dfighter1985
df7307583b
Implemented choosing / resetting vegetset for tile sets.
...
--HG--
branch : gsoc2014-dfighter
2014-07-24 23:31:37 +02:00
dfighter1985
2993c88a5d
When selecting another land, select the first tile set, if it exists.
...
--HG--
branch : gsoc2014-dfighter
2014-07-24 18:44:00 +02:00
dfighter1985
f66c1e837e
Connect the selection model so the widgets are updated.
...
--HG--
branch : gsoc2014-dfighter
2014-07-24 18:39:34 +02:00
dfighter1985
9b403212c0
Each land has it's own TilesetModel now. When changing the land the model also changes.
...
--HG--
branch : gsoc2014-dfighter
2014-07-24 18:31:07 +02:00
dfighter1985
947782a2c5
Implemented land name changing.
...
--HG--
branch : gsoc2014-dfighter
2014-07-24 16:25:28 +02:00
dfighter1985
9519c4f0f5
Implemented land removal.
...
--HG--
branch : gsoc2014-dfighter
2014-07-24 16:20:44 +02:00
dfighter1985
02ccd3b1c1
Implemented land adding.
...
--HG--
branch : gsoc2014-dfighter
2014-07-24 16:18:01 +02:00
dfighter1985
e9e42701b9
Renamed land related widgets.
...
--HG--
branch : gsoc2014-dfighter
2014-07-24 16:09:58 +02:00
dfighter1985
c7ca20c748
Implemented tileset move up and move down.
...
--HG--
branch : gsoc2014-dfighter
2014-07-24 02:28:19 +02:00
dfighter1985
9d1fec6ce1
Implemented tileset rename.
...
--HG--
branch : gsoc2014-dfighter
2014-07-23 21:53:09 +02:00
dfighter1985
71fc4a098b
Implemented tileset removal.
...
--HG--
branch : gsoc2014-dfighter
2014-07-23 18:35:26 +02:00
dfighter1985
5301b00e58
Don't try to delete the same items more than once!
...
--HG--
branch : gsoc2014-dfighter
2014-07-22 15:38:26 +02:00
dfighter1985
4d6de3f737
Don't allow 2 tilesets to have the same name.
...
--HG--
branch : gsoc2014-dfighter
2014-07-22 15:35:14 +02:00
dfighter1985
dcc072ba18
Update qrc location.
...
--HG--
branch : gsoc2014-dfighter
2014-07-22 14:44:31 +02:00
dfighter1985
8373118c7e
Merged default.
...
--HG--
branch : gsoc2014-dfighter
2014-07-22 00:15:50 +02:00
dfighter1985
3940e656e3
Error message when files can't be opened.
...
--HG--
branch : gsoc2014-dfighter
2014-07-21 23:25:35 +02:00
dfighter1985
32172e0e77
Added save and save as items to the context menu.
...
--HG--
branch : gsoc2014-dfighter
2014-07-21 23:08:05 +02:00
dfighter1985
ed44cc4823
Shouldn't crash when adding a new row.
...
--HG--
branch : gsoc2014-dfighter
2014-07-21 17:46:01 +02:00
dfighter1985
26b120f664
Mark translated item with green, untranslated ones with red.
...
--HG--
branch : gsoc2014-dfighter
2014-07-21 04:11:53 +02:00
dfighter1985
e92a07db33
New context menu options: mark / unmark translated.
...
--HG--
branch : gsoc2014-dfighter
2014-07-21 03:51:03 +02:00
dfighter1985
2fea6f45f5
Make sure a correct hash is not used for untranslated strings.
...
--HG--
branch : gsoc2014-dfighter
2014-07-21 03:24:18 +02:00
dfighter1985
0bd4b56589
Save to the right file.
...
--HG--
branch : gsoc2014-dfighter
2014-07-20 20:03:16 +02:00
dfighter1985
76d3e0df20
Set header text according to the language.
...
--HG--
branch : gsoc2014-dfighter
2014-07-20 19:52:23 +02:00
dfighter1985
2c812e90ab
Work with translated files, instead of work files.
...
--HG--
branch : gsoc2014-dfighter
2014-07-20 17:24:04 +02:00
dfighter1985
fbcfa4ee6f
Ask for confirmation before deleting a row.
...
--HG--
branch : gsoc2014-dfighter
2014-07-19 17:26:59 +02:00
dfighter1985
62a6b408a2
Show insert / delete row in context menu.
...
--HG--
branch : gsoc2014-dfighter
2014-07-19 17:23:53 +02:00
kervala
38f79138b9
Changed: Determinates 3dsmax SDK base directory
2014-07-19 14:04:19 +02:00
kervala
1ace2090fb
Fixed: Give priority to fmod64 in 64 bits
2014-07-19 14:03:22 +02:00
kervala
9b600a154d
Fixed: Initialization of pointers in constructor
2014-07-19 14:02:43 +02:00
kervala
4b39f9640d
Changed: Minor optimization and warning
2014-07-19 14:01:44 +02:00
kervala
0bb464411b
Changed: Replaced tests with .size() by .empty() because faster
2014-07-19 14:01:03 +02:00
kervala
49c53955a6
Fixed: Some typos
2014-07-19 13:59:54 +02:00
kervala
23b73eff1d
Changed: Minor change
2014-07-19 11:24:07 +02:00
kervala
3fb0dfe0c2
Changed: Some Big endian swaps (for PowerPC especially)
2014-07-19 11:23:49 +02:00
kervala
42eeb9ad59
Fixed: Use UTF-8 for French translations
...
Changed: Improved some translations (more to come)
2014-07-19 11:19:34 +02:00
kervala
c1ea3820d5
Fixed: Warning
2014-07-19 11:16:43 +02:00
kervala
8d2db7bc85
Changed: Replaced atof by NLMISC::fromString
2014-07-19 11:14:38 +02:00
dfighter1985
d9c2620e6e
Implemented row deletion / insertion.
...
--HG--
branch : gsoc2014-dfighter
2014-07-18 01:52:23 +02:00
dfighter1985
485ee77406
Use the QWidget modified property instead of the UXTEditor's own.
...
--HG--
branch : gsoc2014-dfighter
2014-07-18 01:18:41 +02:00
dfighter1985
3e188334fe
Allow only 1 instance of the uxt editor.
...
--HG--
branch : gsoc2014-dfighter
2014-07-18 01:08:31 +02:00
dfighter1985
9bda0bd1e7
Added copyright headers to the new files.
...
--HG--
branch : gsoc2014-dfighter
2014-07-18 00:53:36 +02:00
dfighter1985
05216897f0
Implemented saving.
...
--HG--
branch : gsoc2014-dfighter
2014-07-18 00:50:40 +02:00
dfighter1985
fbc1632d04
Apply table changes to the loaded data, and offer to save when closing the changed table.
...
--HG--
branch : gsoc2014-dfighter
2014-07-18 00:27:05 +02:00
dfighter1985
0de5152aa9
Set header texts.
...
--HG--
branch : gsoc2014-dfighter
2014-07-17 19:17:02 +02:00
dfighter1985
d33fb9345e
UXT Editor widget
...
--HG--
branch : gsoc2014-dfighter
2014-07-17 19:08:29 +02:00
KISHAN GRIMOUT
b9dc8ace7e
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
f724d13700
Fix #71
2014-07-28 22:16:41 +02:00
kaetemi
5930d3b384
Backed out changeset: 7bdb27443f88
2014-07-28 22:15:09 +02:00
kaetemi
12aa02585f
Fix self illumination color widget in NeL Material script
2014-07-28 18:32:05 +02:00
kaetemi
3b4e1a32cb
Fix NeL Material script defaults, fix #166
2014-07-28 18:31:40 +02:00
kaetemi
6e3827928b
Adjust 3ds Max plugin versioning info
2014-07-28 18:31:20 +02:00
dfighter1985
f60f761b7a
I don't really know what to write here.
...
--HG--
branch : gsoc2014-dfighter
2014-07-16 02:52:17 +02:00
dfighter1985
28c30b70f1
Set the undostack so we won't crash...
...
--HG--
branch : gsoc2014-dfighter
2014-07-15 21:46:16 +02:00
dfighter1985
d30e9ad226
Initialize the undostack to NULL, so we get a proper crash instead of a dangled pointer crash.
...
--HG--
branch : gsoc2014-dfighter
2014-07-15 21:41:11 +02:00
dfighter1985
63b6a03f85
Fixed another crash.
...
--HG--
branch : gsoc2014-dfighter
2014-07-15 20:29:57 +02:00
dfighter1985
1cbcca259c
'Fixed' the Mission Compiler crash.
...
--HG--
branch : gsoc2014-dfighter
2014-07-15 20:19:53 +02:00
dfighter1985
56a4c3ea7d
When changing a property make sure to set default to false, so it's actually saved!
...
--HG--
branch : gsoc2014-dfighter
2014-07-15 18:51:06 +02:00
kaetemi
ca4c302c6a
Disable WG specifics in r2_login script
2014-07-15 15:25:09 +02:00
dfighter1985
61b8a4ef82
Save world editor files.
...
--HG--
branch : gsoc2014-dfighter
2014-07-15 01:30:30 +02:00
kaetemi
3f5eedf040
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
aca4d8e48b
One set of SQL scripts to rule them all
2014-07-14 19:15:23 +02:00
dfighter1985
2d865a8567
Trying to load an invalid world editor file shouldn't crash the application, and an error messagebox should inform the user.
...
--HG--
branch : gsoc2014-dfighter
2014-07-13 21:38:14 +02:00
kaetemi
176c3d8a4a
Add callback template class
...
--HG--
branch : develop
2014-07-12 18:19:25 +02:00
kaetemi
fff4edb2c9
Maybe solves #210
...
--HG--
branch : develop
2014-10-16 02:00:53 +02:00
kaetemi
7487ea4135
Higher quality outline, visual difference is relevant only for black
...
--HG--
branch : develop
2014-10-16 02:00:45 +02:00
Laszlo Kis-Adam
03af2ed463
Merged in dfighter1985/ryzomcore/dfighter-tools (pull request #94 )
...
Just too lazy to push directly
--HG--
branch : develop
2014-10-15 19:48:23 +02:00
kaetemi
b010f224e4
Don't use I18N when the required ui prefix is not in the tooltip text (convention actually dictates uitt as tooltip prefix)
...
--HG--
branch : develop
2014-10-14 23:45:08 +02:00
kaetemi
07a57f81f8
Shadow should not be taken into account for font height, breaks vertical centering
...
--HG--
branch : develop
2014-10-14 23:45:08 +02:00
kaetemi
7200d17801
HID: Adjust free look
...
--HG--
branch : game-device
2014-07-12 17:47:00 +02:00
kaetemi
496f7f268c
Trash DirectInput
...
--HG--
branch : game-device
2014-07-12 17:17:24 +02:00
dfighter1985
3517283526
Apply property changes.
...
--HG--
branch : gsoc2014-dfighter
2014-07-12 01:54:45 +02:00
dfighter1985
3ad5ffee15
Block only the propertychanged signal in the const_string_array property manager.
...
--HG--
branch : gsoc2014-dfighter
2014-07-12 00:38:35 +02:00
dfighter1985
8f8b4fae65
Store QtProperty, IPrimitive pairs and look the primitive up when the property changes.
...
--HG--
branch : gsoc2014-dfighter
2014-07-12 00:01:17 +02:00
dfighter1985
820b6bc8ca
Changed property to p, property is a reserved word in VS.
...
--HG--
branch : gsoc2014-dfighter
2014-07-11 20:47:24 +02:00
dfighter1985
aa82655ee7
Use \n instead of ; as a separator.
...
--HG--
branch : gsoc2014-dfighter
2014-07-11 20:41:15 +02:00
dfighter1985
8ff5317f01
Identation
...
--HG--
branch : gsoc2014-dfighter
2014-07-11 20:37:32 +02:00
dfighter1985
a222e44eaa
Implemented const_string_array editor.
...
--HG--
branch : gsoc2014-dfighter
2014-07-11 20:35:05 +02:00
dfighter1985
094210a079
Workaround related to the unknown statusbar crash.
...
--HG--
branch : gsoc2014-dfighter
2014-07-09 23:20:50 +02:00
dfighter1985
d850a07e9e
Copyright banner + line endings... I always mess this up somehow..
...
--HG--
branch : gsoc2014-dfighter
2014-07-09 21:13:57 +02:00
dfighter1985
012ad96806
Texture chooser now supports atlas textures as well.
...
--HG--
branch : gsoc2014-dfighter
2014-07-09 21:07:12 +02:00
kaetemi
e729a9d035
Fix #162 : Center ingame mouse cursor after login
2014-07-09 12:31:22 +02:00
kaetemi
246d931bee
Formatting: Use tabs
2014-07-09 16:59:55 +02:00
KISHAN GRIMOUT
107646d95d
fix windows 64bit build in mem_displayer.cpp
2014-07-09 13:41:43 +02:00
kaetemi
f281622d47
Trash DirectInput
...
--HG--
branch : game-device
2014-07-08 22:21:11 +02:00
dfighter1985
a1b0f9d7e2
Added texture property editor, editor factory, manager. Textures can now be selected using these in the property tree browser.
...
--HG--
branch : gsoc2014-dfighter
2014-07-08 18:59:30 +02:00
dfighter1985
7cbc82fe8f
Added action property editor, editor factory, manager. Actions can now be edited using the editor widget in the property tree.
...
--HG--
branch : gsoc2014-dfighter
2014-07-08 18:26:20 +02:00
dfighter1985
396a3c2db2
Allow TextureChooser's texture selection to be queried.
...
--HG--
branch : gsoc2014-dfighter
2014-07-07 19:19:03 +02:00
shubham_meena
4c0d3e53fc
fixed few bugs
...
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-07-07 13:56:58 +05:30
dfighter1985
fe58435bb5
CPath can now return the file list with a path filter.
...
--HG--
branch : gsoc2014-dfighter
2014-07-06 23:21:25 +02:00
shubham_meena
11a3df1aaa
branch updated
...
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-07-07 02:12:40 +05:30
shubham_meena
edfe73b1ec
merging conflicts
...
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-07-07 01:57:08 +05:30
shubham_meena
931d18323b
removed merged conflicts
...
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-07-07 01:48:42 +05:30
shubham_meena
d59b6cc642
updates database
...
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-07-05 13:01:56 +05:30
dfighter1985
6119f2c480
Make sure to always convert to plain bitmap.
...
--HG--
branch : gsoc2014-dfighter
2014-07-05 03:31:21 +02:00
dfighter1985
1dee9d232b
No need to store the loaded image data after passing it to the label.
...
--HG--
branch : gsoc2014-dfighter
2014-07-05 03:13:01 +02:00
dfighter1985
1e6dc1cc37
Prototype of the texture chooser.
...
--HG--
branch : gsoc2014-dfighter
2014-07-05 02:55:46 +02:00
shubham_meena
1ef330b076
hook functionality
...
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-07-03 16:44:37 +05:30
dfighter1985
e4e2a57b65
ActionList dialog can now select an action, and is used with the proc editor.
...
--HG--
branch : gsoc2014-dfighter
2014-07-03 00:44:38 +02:00
dfighter1985
085c1b41b9
Added facilities for viewing the loaded actions.
...
--HG--
branch : gsoc2014-dfighter
2014-07-02 22:27:04 +02:00
dfighter1985
0d9022226c
Line endings...
...
--HG--
branch : gsoc2014-dfighter
2014-07-02 20:44:46 +02:00
dfighter1985
471c3a0dc5
Changed some property types.
...
--HG--
branch : gsoc2014-dfighter
2014-07-01 01:54:55 +02:00
dfighter1985
c6312db222
Bitmap alignment can now be set as an enum.
...
--HG--
branch : gsoc2014-dfighter
2014-07-01 01:51:41 +02:00
dfighter1985
27fe95904a
Quelled some compiler compliants.
...
--HG--
branch : gsoc2014-dfighter
2014-06-29 03:01:43 +02:00
dfighter1985
7f5973e462
tooltip parent is now changable using an enum.
...
--HG--
branch : gsoc2014-dfighter
2014-06-29 02:53:33 +02:00
dfighter1985
842ca366de
Tooltip posrefs are now enums in the GUI Editor.
...
--HG--
branch : gsoc2014-dfighter
2014-06-29 01:44:06 +02:00
dfighter1985
809fcab9e2
Forgot the widget settings...
...
--HG--
branch : gsoc2014-dfighter
2014-06-27 00:49:31 +02:00
dfighter1985
b88e53c685
Got rid of a memleak.
...
--HG--
branch : gsoc2014-dfighter
2014-06-27 00:47:29 +02:00
dfighter1985
0c4e0e63cc
The proper enum type is now determined by type not name.
...
--HG--
branch : gsoc2014-dfighter
2014-06-27 00:24:31 +02:00
dfighter1985
e182e25e07
text posref is now an enum too.
...
--HG--
branch : gsoc2014-dfighter
2014-06-27 00:07:44 +02:00
shubham_meena
e7e4b88747
function to install update in the plugin
...
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-06-23 14:36:29 +05:30
dfighter1985
ec86d0381b
Some refactoring.
...
--HG--
branch : gsoc2014-dfighter
2014-06-21 22:55:10 +02:00
kaetemi
e8f7851dd2
Fix compile
2014-06-21 22:32:49 +02:00
dfighter1985
250cd6efc1
Posref can now be set as an enum, instead of a string in the property editor.
...
--HG--
branch : gsoc2014-dfighter
2014-06-21 18:25:14 +02:00
kaetemi
353c74ff21
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
5cb8a7700e
Exit with error
2014-06-21 05:46:20 +02:00
kaetemi
cf3e779ae9
Fix compile
2014-06-20 23:38:44 +02:00
kaetemi
655c22e839
Fix compile
2014-06-20 23:24:54 +02:00
kaetemi
5312547295
Add option for -mfpmath=both flag
2014-06-20 19:46:33 +02:00
kaetemi
ed5721a79b
Add SSE3 compile flag if enabled
2014-06-20 18:51:34 +02:00
kaetemi
07dd9eb85b
Compile fix
2014-06-20 17:53:38 +02:00
dfighter1985
1afe2d4a17
Text justification can now be set using an enum property editor.
...
--HG--
branch : gsoc2014-dfighter
2014-06-20 17:07:27 +02:00
dfighter1985
9e36082ff0
A little refactoring
...
--HG--
branch : gsoc2014-dfighter
2014-06-20 16:26:10 +02:00
dfighter1985
25df3c8afe
Button types can now be set using an enum property editor.
...
--HG--
branch : gsoc2014-dfighter
2014-06-20 16:22:07 +02:00
dfighter1985
49002d0250
Line endings...
...
--HG--
branch : gsoc2014-dfighter
2014-06-20 15:09:13 +02:00
kaetemi
43a061bebd
SSE2: Compile fix
...
--HG--
branch : sse2
2014-06-20 03:08:51 +02:00
dfighter1985
1ce333bb00
As Object Viewer no longer uses the QtOpenGL widget this is not needed.
...
--HG--
branch : gsoc2014-dfighter
2014-06-19 18:40:50 +02:00
dfighter1985
bb7fa7987b
More widgets can use the color picker now.
...
--HG--
branch : gsoc2014-dfighter
2014-06-19 17:21:11 +02:00
shubham_meena
ae7503df36
template with list of updates
...
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-06-19 17:16:24 +05:30
shubham_meena
f09e4e48a5
template for updates of plugins
...
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-06-19 17:11:10 +05:30
shubham_meena
4d1d52fc73
check functionality for existing updates
...
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-06-19 14:53:49 +05:30
dfighter1985
f1ff5e7d2c
Added color picking support to the GUI Editor. TODO: change all the widget definitions.
...
--HG--
branch : gsoc2014-dfighter
2014-06-18 16:48:33 +02:00
shubham_meena
678cc254ee
updating functionality with some error fixes
...
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-06-18 15:10:31 +05:30
dfighter1985
0a26a5a1c6
Why did I make these public in the first place?
...
--HG--
branch : gsoc2014-dfighter
2014-06-18 02:53:39 +02:00
dfighter1985
d64b499284
Making master Dnk happy.
...
--HG--
branch : gsoc2014-dfighter
2014-06-18 02:51:53 +02:00
dfighter1985
3d48a01170
Wrong slash...
...
--HG--
branch : gsoc2014-dfighter
2014-06-18 02:41:58 +02:00
dfighter1985
a80053083d
Crashfix: If the status info widget isn't removed it miraclously crashes the app on shutdown. TODO: investigate why.
...
--HG--
branch : gsoc2014-dfighter
2014-06-18 01:20:37 +02:00
dfighter1985
4341ac3139
Unload plugins when killing them.
...
--HG--
branch : gsoc2014-dfighter
2014-06-18 01:15:39 +02:00
dfighter1985
ca78ce10a0
Object Viewer plugin will now use the Nel3DWidget in the Core plugin.
...
--HG--
branch : gsoc2014-dfighter
2014-06-16 16:22:52 +02:00
dfighter1985
d74d1d1663
Had to move the Nel3DWidget library to the core plugin, because Nel can only be used statically at this point. Which makes using the separate Nel3DWidget library inparctical.
...
--HG--
branch : gsoc2014-dfighter
2014-06-16 15:30:35 +02:00
dfighter1985
b4eac44a9d
Moved the Nel 3d widget into it's own library.
...
--HG--
branch : gsoc2014-dfighter
2014-06-15 22:22:01 +02:00
dfighter1985
dde63ceb31
Nel3DWidget is no longer in the GUI Editor namespace.
...
--HG--
branch : gsoc2014-dfighter
2014-06-15 19:52:04 +02:00
dfighter1985
81908eea01
Set some windows attributes.
...
--HG--
branch : gsoc2014-dfighter
2014-06-15 19:42:41 +02:00
dfighter1985
e5921ffd64
Activate the driver when getting a show event, and clear the GUI Editor display widget when there's no GUI loaded.
...
--HG--
branch : gsoc2014-dfighter
2014-06-15 19:28:57 +02:00
dfighter1985
f8505429ee
Moved the event listener from the 3d widget to the gui control class.
...
--HG--
branch : gsoc2014-dfighter
2014-06-15 19:16:52 +02:00
dfighter1985
3cbe37d700
Fixed build error that was caused by two widgets having the same filenames.
...
--HG--
branch : gsoc2014-dfighter
2014-06-15 18:41:54 +02:00
shubham_meena
cebfde66f7
deactivating a plugin in ams
...
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-06-15 09:45:00 +05:30
shubham_meena
2f81e3c1b9
activating a plugin in ams
...
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-06-15 09:42:09 +05:30
dfighter1985
59b4735d96
Renamed nelgui_widget.* to nelgui_ctrl.*
...
--HG--
branch : gsoc2014-dfighter
2014-06-14 19:37:42 +02:00
dfighter1985
676587559b
Renamed NelGUIWidget to NelGUICtrl, and changed it's base class from QWidget to QObject.
...
--HG--
branch : gsoc2014-dfighter
2014-06-14 18:44:57 +02:00
dfighter1985
1457469dfe
TimerId should be set to 0 when hiding.
...
--HG--
branch : gsoc2014-dfighter
2014-06-14 18:32:27 +02:00
dfighter1985
9d9cd463b0
GUI Editor main window will now send the show/hide events to NelGUIWidget.
...
--HG--
branch : gsoc2014-dfighter
2014-06-14 18:31:50 +02:00
dfighter1985
c692b168d7
Split Nel3DWidget and NelGUIWidget.
...
--HG--
branch : gsoc2014-dfighter
2014-06-14 17:28:33 +02:00
kaetemi
cec2970169
SSE2: Replace prefetch
...
--HG--
branch : sse2
2014-06-14 01:09:05 +02:00
kaetemi
6734852fa3
SSE2: Ensure correct allocator is used
...
--HG--
branch : sse2
2014-06-14 00:38:35 +02:00
kaetemi
71a598db7e
SSE2: Remove dead code
...
--HG--
branch : sse2
2014-06-13 22:21:07 +02:00
kaetemi
848932f93a
SSE2: Fix for MinGW
...
--HG--
branch : sse2
2014-06-19 00:05:43 +02:00
kaetemi
ac3e69b8ab
Merge with default
...
--HG--
branch : sse2
2014-06-20 03:01:32 +02:00
kaetemi
93e97c56cd
Implement occlusion queries for AMD/ATI in the OpenGL driver
2014-06-19 21:49:33 +02:00
kaetemi
66922f04bd
Fix Ryzom server compile under MinGW
2014-06-19 20:43:03 +02:00
kaetemi
fd6a95e3a3
Backed out changeset: f665fcc42968 (except dru.cpp)
2014-06-19 20:22:12 +02:00
kaetemi
b18203fc4e
Fix Ryzom server compile under MinGW
2014-06-19 20:19:39 +02:00
kaetemi
2e096a9b36
Fix Ryzom client compile under MinGW
2014-06-19 01:17:35 +02:00
kaetemi
7adf98e8a7
Fix NeL GUI compile under MinGW
2014-06-19 00:40:29 +02:00
kaetemi
cffd68230c
Fix XA2 driver compile under MinGW
2014-06-18 23:18:06 +02:00
kaetemi
401d4bc791
Fix NeL Tools compile under MinGW
2014-06-18 21:05:39 +02:00
kaetemi
43be0fd2a5
Fix D3D driver compile under MinGW
2014-06-18 16:29:02 +02:00
kaetemi
40854aa5f3
Fix NeLNS compile under MinGW
2014-06-18 13:03:11 +02:00
kaetemi
75f7b9f931
Fix Snowballs service compile under MinGW
2014-06-18 12:52:03 +02:00
kaetemi
ee4a9ef334
Fix NeL Samples for MinGW
2014-06-18 12:40:53 +02:00
kaetemi
9838ef56de
Fix Snowballs compile under MinGW
2014-06-18 02:05:54 +02:00
kaetemi
f4fd8bb669
Fix linking of OpenGL driver under MinGW
2014-06-18 01:21:05 +02:00
kaetemi
2f3f12e034
Fix linking of OpenAL driver under MinGW
2014-06-18 00:28:08 +02:00
kaetemi
5bd6c5e06b
Fix compilation of NL3D under MinGW
2014-06-17 22:33:56 +02:00
kaetemi
1df9bec563
Fix compilation of NLNET under MinGW
2014-06-17 21:56:53 +02:00
kaetemi
3dd11fe157
Fix compilation of NLMISC under MinGW
2014-06-17 21:48:25 +02:00
kaetemi
f6ad306a57
SSE2: Add macro for force inline
...
--HG--
branch : sse2
2014-06-13 20:25:45 +02:00
kaetemi
d3fb390cf3
SSE2: Align CMatrix
...
--HG--
branch : sse2
2014-06-13 19:33:09 +02:00
kaetemi
556a41afee
SSE2: Implement alignment for arena allocator
...
--HG--
branch : sse2
2014-06-13 19:26:22 +02:00
kaetemi
eee9ba0cae
SSE2: Add aligned allocators
...
--HG--
branch : sse2
2014-06-13 19:12:31 +02:00
kaetemi
4ed37ac68e
SSE2: Add CMake options
...
--HG--
branch : sse2
2014-06-13 19:00:24 +02:00
shubham_meena
59a6c6b8c3
deleting plugin from ams
...
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-06-13 17:21:49 +05:30
shubham_meena
ad2ed4dfa4
Plugin installation first upload t{block name=content}
...
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-06-13 16:40:27 +05:30
shubham_meena
a15462c863
plugin installer functionality
...
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-06-11 15:57:07 +05:30
shubham_meena
c558b92bf5
plugin interaction files
...
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-06-11 11:52:57 +05:30
shubham_meena
2f023e0bdc
Database CREATE TABLE IF NOT EXISTS . (
...
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-06-10 12:11:34 +05:30
dfighter1985
fe7c3e4edf
Rename log menu item.
...
--HG--
branch : gsoc2014-dfighter
2014-06-09 18:01:14 +02:00
dfighter1985
92cb5eea3a
Updated qrc location.
...
--HG--
branch : gsoc2014-dfighter
2014-06-09 17:58:07 +02:00
dfighter1985
a86605f8d8
Move the log trigger menu item into it's own menu, and remove the menu when unloading the plugin.
...
--HG--
branch : gsoc2014-dfighter
2014-06-09 17:55:45 +02:00
dfighter1985
d4ee31ed63
Destroy context when unloading plugins.
...
--HG--
branch : gsoc2014-dfighter
2014-06-09 17:40:06 +02:00
dfighter1985
f060adbed7
Plugin loading, with issues..
...
--HG--
branch : gsoc2014-dfighter
2014-06-09 01:14:13 +02:00
dfighter1985
c45b6a17f4
Don't crash when removing the plugin of the first tab.
...
--HG--
branch : gsoc2014-dfighter
2014-06-08 21:56:31 +02:00
dfighter1985
0096ad1204
Remove Object Viewer menus when unloading the plugin.
...
--HG--
branch : gsoc2014-dfighter
2014-06-08 19:39:58 +02:00
dfighter1985
9ad71881dc
Line endings...
...
--HG--
branch : gsoc2014-dfighter
2014-06-08 19:28:19 +02:00
dfighter1985
b9bbe802d4
Remove display sheet id action when unloading the plugin.
...
--HG--
branch : gsoc2014-dfighter
2014-06-08 19:27:03 +02:00
dfighter1985
3fc289e7fa
Remove sheet builder action when unloading the plugin.
...
--HG--
branch : gsoc2014-dfighter
2014-06-08 18:56:40 +02:00
dfighter1985
828f31a2a4
Remove translation manager menu when unloading the plugin.
...
--HG--
branch : gsoc2014-dfighter
2014-06-08 18:45:13 +02:00
dfighter1985
fb4dc15fe7
Remove GUI Editor menu when unloading the plugin.
...
--HG--
branch : gsoc2014-dfighter
2014-06-08 18:30:09 +02:00
dfighter1985
d7536332a6
Implemented plugin unload.
...
--HG--
branch : gsoc2014-dfighter
2014-06-08 18:17:24 +02:00
dfighter1985
eb41278369
GUI for plugin loading / unloading in the plugin dialog.
...
--HG--
branch : gsoc2014-dfighter
2014-06-07 21:07:46 +02:00
dfighter1985
732b24b985
Updated qrc location.
...
--HG--
branch : gsoc2014-dfighter
2014-06-07 20:04:15 +02:00
dfighter1985
c2a951fd6c
Progressbar should look nicer on the splash screen now.
...
--HG--
branch : gsoc2014-dfighter
2014-06-07 18:10:43 +02:00
dfighter1985
f0a312a6e5
Progress bar will now actually show progress.
...
--HG--
branch : gsoc2014-dfighter
2014-06-07 17:23:06 +02:00
dfighter1985
f177a49a9e
Instead of drawing the progressbar on the splash image, draw it below it. Also move the status text closer to the progress bar.
...
--HG--
branch : gsoc2014-dfighter
2014-06-07 16:56:10 +02:00
dfighter1985
2ce11cc2f9
Line endings...
...
--HG--
branch : gsoc2014-dfighter
2014-06-07 16:41:39 +02:00
kaetemi
15dc492690
Set additional preferred memory
2014-06-05 15:51:25 +02:00
kaetemi
ad0bf64b18
Cleanup extension initialization
2014-06-05 15:03:09 +02:00
dfighter1985
91463f9fa2
The splash screen will now inform the user about what's happening.
...
--HG--
branch : gsoc2014-dfighter
2014-06-05 01:57:13 +02:00
dfighter1985
cfa12b6d81
Somehow I always forget the banners...
...
--HG--
branch : gsoc2014-dfighter
2014-06-04 22:30:32 +02:00
dfighter1985
c15eebaadf
First iteration of the new splash screen.
...
--HG--
branch : gsoc2014-dfighter
2014-06-04 22:09:11 +02:00
kaetemi
766cace955
Implement volatile vertex buffer for opengl driver, should provide considerable performance improvements for particle systems. Needs additional testing.
2014-06-04 18:59:54 +02:00
shubham_meena
bf47b07fe0
changes indentation and extra spaces
...
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-06-01 19:52:54 +00:00
shubham_meena
c4ff97cefd
template for plugins in AMS
...
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-06-02 01:05:37 +05:30
shubham_meena
8a28b3583a
restructuring of AMS database functions to work with CRUD
...
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-05-28 03:48:44 +05:30
shubham_meena
a92f32c1c4
few more changes to the CRUD layer in ams
...
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-05-27 14:19:37 +05:30
dfighter1985
1d23a092c1
rename.
...
--HG--
branch : gsoc2014-dfighter
2014-05-26 21:07:39 +02:00
dfighter1985
883c0d4462
Settings dialog on first startup.
...
--HG--
branch : gsoc2014-dfighter
2014-05-26 21:04:05 +02:00
dfighter1985
1306853697
More renames.
...
--HG--
branch : gsoc2014-dfighter
2014-05-25 22:45:34 +02:00
shubham_meena
23c0a8bc24
CRUD layer for AMS
...
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-05-25 15:03:20 +05:30
kaetemi
0d67c420cd
Set exec mode
2014-05-23 22:39:50 +02:00
kaetemi
1f786418a7
Crash safely with an error when sphrase is missing on client
2014-05-23 19:13:36 +02:00
kaetemi
47e5e587ad
Use vector instead of map to store sbrick sheets, it's faster
2014-05-23 19:13:08 +02:00
kaetemi
4311da091f
Add --admininstall parameter to c1_shard_patch
2014-05-23 17:25:52 +02:00
dfighter1985
4adbb6dbd9
Moved plugin menu items to their own sub-menu into the menubar.
...
--HG--
branch : gsoc2014-dfighter
2014-05-23 02:26:31 +02:00
kaetemi
0a41e6b3c4
Fix Windows compilation of lightmap_optimizer
2014-05-23 01:57:19 +02:00
dfighter1985
79348c8e93
More renames.
...
--HG--
branch : gsoc2014-dfighter
2014-05-22 15:56:38 +02:00
dfighter1985
ef7a39641f
Rename.
...
--HG--
branch : gsoc2014-dfighter
2014-05-22 15:06:40 +02:00
dfighter1985
eeb4e48d38
Renames.
...
--HG--
branch : gsoc2014-dfighter
2014-05-19 02:08:03 +02:00
dfighter1985
0974142bcc
Renamed the plugin XML files.
...
--HG--
branch : gsoc2014-dfighter
2014-05-19 01:45:19 +02:00
dfighter1985
3440c7081b
Renamed ovqt and ovqt plugin binaries.
...
--HG--
branch : gsoc2014-dfighter
2014-05-18 21:47:31 +02:00
liria
94b30c76fa
Merged default into lightmap_optimizer_port_to_linux
...
--HG--
branch : lightmap_optimizer_port_to_linux
2014-05-15 16:36:59 +02:00
dfighter1985
12890373a4
Merged default
...
--HG--
branch : gsoc2014-dfighter
2014-05-14 18:01:15 +02:00
kervala
574382fcbb
Changed: Set official Ryzom client version and identifiers for OS X bundle
...
--HG--
branch : compatibility
2014-05-13 10:02:32 +02:00
kervala
a7eedeb7c7
Merge with default
...
--HG--
branch : compatibility
2014-05-13 09:37:06 +02:00
kervala
46e5c39e74
Changed: Replaced some spaces by tabulations
2014-05-13 09:29:45 +02:00
botanic
b57755b9ee
Fix for bug from de6f606
2014-05-10 09:15:00 -07:00
kervala
d7c9608d83
Fixed: Compilation error
2014-05-09 19:18:56 +02:00
dfighter1985
e6569049e9
Same as before...
...
--HG--
branch : gsoc2014-dfighter
2014-05-07 00:53:07 +02:00
dfighter1985
3c72598645
Readding core plugin that was missing because of a hgignore entry.
...
--HG--
branch : gsoc2014-dfighter
2014-05-07 00:50:57 +02:00
dfighter1985
91f859bc8a
Moved ovqt to /code/studio
...
--HG--
branch : gsoc2014-dfighter
2014-05-06 01:30:28 +02:00
kaetemi
fea9413c18
Merge with default
...
--HG--
branch : compatibility
2014-04-30 13:02:11 +02:00
kaetemi
db5c65fedf
Merge
2014-04-30 12:57:54 +02:00
kaetemi
1a4a7bafab
Backed out changeset: 897087f1fa71, 7c3f1f0dc9d8, 61d11f94e3ea
2014-04-30 12:54:20 +02:00
kaetemi
798d207d0d
Fix EOL
2014-04-30 12:53:06 +02:00
kervala
1150cfeb75
Changed: Updated client_default.cfg to official client one
...
--HG--
branch : compatibility
2014-04-30 09:30:32 +02:00
kervala
55e7199c69
Merge with default
...
--HG--
branch : compatibility
2014-04-30 09:19:45 +02:00
kervala
060347f2b9
Changed: Small typo
2014-04-30 09:18:31 +02:00
kervala
50324ccd55
Fixed #151 : White box on character selection screen (a big thanks to nimetu for the patch!)
2014-04-29 10:31:02 +02:00
kervala
8972ecf1b3
Fixed: tmpFlagRemovedPatchCategories not needed anymore because RemovedPatchCategories defined in login_patch.cpp
2014-04-26 22:51:03 +02:00
sfb
c666176278
Modified the CTestConfig to point at the new CI server.
2014-04-25 14:00:46 -05:00
kervala
732ffaa384
Changed: Official Ryzom URLs
...
--HG--
branch : compatibility
2014-04-25 12:00:29 +02:00
kervala
01bc4eeb92
Changed: Minor changes
2014-04-25 11:58:35 +02:00
kervala
e84dd7b5f7
Changed: Replaced strlwr by toLower
2014-04-24 22:59:29 +02:00
kervala
31859175ba
Backed out changeset: 79980ce60498
2014-04-24 19:31:53 +02:00
kervala
24fa8df5ff
Fusion avec default
...
--HG--
branch : compatibility
2014-04-24 19:16:42 +02:00
Cédric OCHS
bcc22bb11c
Merged in nimetu/ryzomcore/Issue#130 (pull request #65 )
...
Properly restore saved camera distance from config file (issue #130 )
2014-04-24 19:14:01 +02:00
kervala
3fff8fe467
Changed: Replaced strlwr by toLower
...
--HG--
branch : compatibility
2014-04-24 18:11:16 +02:00
Nimetu
7cc1bf9f17
Fix compiling on linux with new OpenGL headers (issue #145 )
...
--HG--
branch : Issue#145
2014-04-23 23:23:23 +03:00
Nimetu
02cb532401
Properly restore saved camera distance from config file (issue #130 )
...
--HG--
branch : Issue#130
2014-04-23 23:20:13 +03:00
dfighter1985
4f39a58e31
Tile Editor crash fixes.
...
--HG--
branch : gsoc2014-dfighter
2014-04-23 02:10:14 +02:00
dfighter1985
fd5d961ba7
Build fixes.
...
--HG--
branch : gsoc2014-dfighter
2014-04-23 00:49:17 +02:00
dfighter1985
f882abca07
Merged Georges Editor branch.
...
--HG--
branch : gsoc2014-dfighter
2014-04-22 21:12:26 +02:00
dfighter1985
4d3a472262
Merged default.
...
--HG--
branch : branch-tile-edit-ovqt-plugin
2014-04-22 21:10:19 +02:00
dfighter1985
f3b94d38d5
Merged default.
...
--HG--
branch : branch-features-geqt-plugin
2014-04-22 21:02:34 +02:00
dfighter1985
4abf74d6e9
We can now drag elements, they will disappear and whatnot, but at least they can be dragged!
...
--HG--
branch : gui-editor
2014-04-21 19:30:33 +02:00
Matthew Lagoe
c7650f041a
Merged in shubham_meena/ryzomcore/issue#119 (pull request #63 )
...
removed wrong panel from settings page
2014-04-21 03:31:14 -07:00
botanic
db2f0435cd
missing =
2014-04-21 03:03:39 -07:00
botanic
bac99a8815
fix for missing include
2014-04-21 03:00:19 -07:00
botanic
18f72e3781
php is_writable is not reliable
2014-04-21 02:39:29 -07:00
dfighter1985
e12d189d51
Refactored input event handling a bit.
...
--HG--
branch : gui-editor
2014-04-20 21:41:57 +02:00
dfighter1985
41f44b2aa6
Merge default.
...
--HG--
branch : gsoc2012-gui-editor
2014-04-19 21:53:29 +02:00
kervala
ed1a84c99b
Changed: Updated OpenGL and OpenGL ES headers
...
--HG--
branch : compatibility
2014-04-17 10:44:03 +02:00
kervala
831758beb1
Fixed: nglXSwapIntervalEXT return type should be void
...
--HG--
branch : compatibility
2014-04-17 10:16:30 +02:00
kervala
5a88951837
Changed: Find DirectX libraries in alternative folders
...
--HG--
branch : compatibility
2014-04-11 17:56:26 +02:00
liria
d89e6c9c2c
Merged default into lightmap_optimizer_port_to_linux
...
--HG--
branch : lightmap_optimizer_port_to_linux
2014-04-11 16:47:50 +02:00
shubham_meena
1970dd0ff4
remove wrong panel from settings page
...
--HG--
branch : issue#119
2014-04-11 13:25:12 +05:30
botanic
4891ce5dc4
fix paths
2014-04-07 08:03:55 -07:00
botanic
fd4fce0d6a
missing .
2014-04-07 06:39:41 -07:00
botanic
5fe1dd709f
display erors on installer
2014-04-07 06:35:15 -07:00
botanic
fff4682d92
missed it on all of them
2014-04-07 06:29:44 -07:00
botanic
cd9deab467
Merge
2014-04-07 06:27:49 -07:00
botanic
08b1602e5a
missed a ../
2014-04-07 06:27:15 -07:00
Matthew Lagoe
0a631f5f9f
Merged in shubham_meena/ryzomcore/issue#120 (pull request #60 )
...
changed hardcoded location of ams_lib with location defined in configuration
2014-04-06 22:31:39 -07:00
Matthew Lagoe
3f54b93b30
Merged in shubham_meena/ryzomcore/Issue#123 (pull request #59 )
...
Changed log-in from username to both username and email
2014-04-06 22:29:55 -07:00
liria
12f63f3a6e
Typo correction
...
--HG--
branch : lightmap_optimizer_port_to_linux
2014-04-05 13:49:14 +00:00
liria
30036d000c
Merged default into lightmap_optimizer_port_to_linux
...
--HG--
branch : lightmap_optimizer_port_to_linux
2014-04-05 15:40:17 +02:00
kaetemi
e494200c21
Bugfix: Kill users who attempt to escape the game
2014-04-01 13:54:39 +02:00
kaetemi
562dae3c3f
Add command to eternally trap players ingame
2014-04-01 13:52:36 +02:00
kaetemi
5ed5cd5ea8
Add interface for HMD with player death support
2014-04-01 13:14:44 +02:00
kervala
8f6c32bd69
Backed out changeset: 3937923211ec
...
--HG--
branch : compatibility
2014-03-29 12:45:22 +01:00
Jan Boon
2eacddc47c
Merged in shubham_meena/ryzomcore/Issue#121 (pull request #58 )
...
Added tile of web in translations
2014-03-28 20:02:14 +01:00
Jan Boon
6765d4f091
Merged in shubham_meena/ryzomcore/issue#127 (pull request #56 )
...
collation changed to utf8_unicode_ci
2014-03-28 20:01:46 +01:00
kaetemi
283f52a03f
Merge
2014-03-28 19:50:21 +01:00
kervala
c83afd649d
Changed: Replaced some Mac OS X warnings by TODO comments
...
--HG--
branch : compatibility
2014-03-27 16:36:00 +01:00
kervala
62eb6347e5
Changed: Aligned methods names
2014-03-27 16:34:55 +01:00
kervala
8968124553
Changed: Aligned methods names
...
--HG--
branch : compatibility
2014-03-27 16:34:55 +01:00
kervala
81881a583f
Fixed: Switch not handled warnings
...
--HG--
branch : compatibility
2014-03-27 15:53:19 +01:00
kervala
9f0daa9a1e
Fixed: Wrong header guard warning
2014-03-27 15:51:20 +01:00
kervala
2e6ac0ad84
Fixed: Wrong header guard warning
...
--HG--
branch : compatibility
2014-03-27 15:51:20 +01:00
kervala
bfaf952f32
Fixed: Warnings with clang: wrong ! and == operators order
2014-03-27 15:50:58 +01:00
kervala
8fa24eeb4e
Fixed: Warnings with clang: wrong ! and == operators order
...
--HG--
branch : compatibility
2014-03-27 15:50:58 +01:00
kervala
b8ad53adf3
Fixed: Typo detected by clang
2014-03-27 13:40:22 +01:00
kervala
79529b1581
Fixed: Typo detected by clang
...
--HG--
branch : compatibility
2014-03-27 13:40:22 +01:00
kervala
a0801ebffe
Changed: Removed useless definitions
2014-03-27 13:39:46 +01:00
kervala
7ab7952dbd
Changed: Removed useless definitions
...
--HG--
branch : compatibility
2014-03-27 13:39:46 +01:00
kervala
def5243d06
Changed: Updated OpenGL headers
2014-03-27 13:39:16 +01:00
kervala
ee87716aa0
Changed: Updated OpenGL headers
...
--HG--
branch : compatibility
2014-03-27 13:39:16 +01:00
kervala
a8c35f9229
Fixed: Used code being removed by -Wl,-x on Mac OS X
2014-03-27 13:03:38 +01:00
kervala
f62b19eb71
Fixed: Used code being removed by -Wl,-x on Mac OS X
...
--HG--
branch : compatibility
2014-03-27 13:03:38 +01:00
shubham_meena
685987149d
changed hardcoded location of ams_lib with location difined in configuration
...
--HG--
branch : issue#120
2014-03-27 16:50:26 +05:30
kervala
a77bddf265
Changed: Give priority to ARB extensions in tests
...
--HG--
branch : compatibility
2014-03-26 14:36:00 +01:00
kervala
55a29115ba
Changed: Detect available video memory with OpenGL extensions
2014-03-26 14:34:07 +01:00
kervala
d4fb36d1eb
Changed: Detect available video memory with OpenGL extensions
...
--HG--
branch : compatibility
2014-03-26 14:34:07 +01:00
kervala
0aaad7051b
Changed: Use OpenGL ES functions prototypes from official headers
2014-03-26 14:32:00 +01:00
kervala
3e30929867
Changed: Use OpenGL ES functions prototypes from official headers
...
--HG--
branch : compatibility
2014-03-26 14:32:00 +01:00
kervala
c59f9d8a5e
Changed: Optimize OpenGL driver PCH
2014-03-26 14:31:32 +01:00
kervala
406df1c59c
Changed: Optimize OpenGL driver PCH
...
--HG--
branch : compatibility
2014-03-26 14:31:32 +01:00
kervala
927ff14998
Changed: Use OpenGL functions prototypes from official headers
...
Fixed: glDeleteObjectBufferATI replaced by glFreeObjectBufferATI since 2002
2014-03-26 14:14:36 +01:00
kervala
713c07e1e6
Changed: Use OpenGL functions prototypes from official headers
...
Fixed: glDeleteObjectBufferATI replaced by glFreeObjectBufferATI since 2002
--HG--
branch : compatibility
2014-03-26 14:14:36 +01:00
kervala
e2797c2567
Changed: Include PCH
2014-03-26 13:14:14 +01:00
kervala
b83c69bf89
Changed: Include PCH
...
--HG--
branch : compatibility
2014-03-26 13:14:14 +01:00
kervala
e9b8ee0fec
Fixed: Improve compilation speed including revision.h in a smaller .cpp file
2014-03-26 13:13:17 +01:00
kervala
868470c19f
Fixed: Improve compilation speed including revision.h in a smaller .cpp file
...
--HG--
branch : compatibility
2014-03-26 13:13:17 +01:00
shubham_meena
420a615321
login.php edited online with Bitbucket: to provide access through both username and email
...
--HG--
branch : Issue#123
2014-03-25 06:35:21 +00:00
shubham_meena
26c8e7ad15
changed login through email / username
...
--HG--
branch : Issue#123
2014-03-25 06:29:17 +00:00
botanic
6c345bf6b7
Merge
2014-03-24 10:45:54 -07:00
botanic
99b122c84c
fix my typo's
2014-03-24 10:45:42 -07:00
shubham_meena
af2cf14273
changed login from username to both username and email
...
--HG--
branch : Issue#123
2014-03-24 17:07:53 +05:30
kervala
16d0f49b45
Changed: Minor changes
2014-03-23 20:36:46 +01:00
kervala
3045bdac62
Changed: Removed pwd command
2014-03-23 20:36:05 +01:00
kervala
3f2b2757d1
Fixed: Removed chmod because useless
2014-03-23 20:34:28 +01:00
kervala
d40db9f2af
Fixed: Wrong parameters passed to bash script
2014-03-23 20:32:44 +01:00
kervala
4c159a04dd
Changed: Use BuildName only on Unix
2014-03-23 20:31:59 +01:00
kervala
697e72751e
Changed: Use fullpath in batch file
2014-03-23 20:27:09 +01:00
kervala
41ac5d56d8
Changed: Create .sh file under Unix
2014-03-23 20:26:29 +01:00
kervala
350c6ec5d7
Changed: Renamed RZ_PATCH to RZ_USE_PATCH
2014-03-23 20:25:48 +01:00
shubham_meena
5bef18032e
added web title in translations
...
--HG--
branch : Issue#121
2014-03-23 18:48:39 +05:30
shubham_meena
7217a99c59
added title of web in translations
...
--HG--
branch : Issue#121
2014-03-23 17:56:42 +05:30
shubham_meena
bfb2b0c595
libsetup.php edited online with Bitbucket
...
--HG--
branch : issue#127
2014-03-23 10:45:30 +00:00
shubham_meena
f6f0f42d1f
colation changed to utf8_unicode_ci
...
--HG--
branch : issue#127
2014-03-23 15:16:20 +05:30
kervala
7932937df9
Changed: Don't patch "main_exedll" and "main_cfg" categories under Unix
2014-03-22 19:36:53 +01:00
kervala
aa9c18481d
Changed: Use "BuildName" from client_default.cfg to determinate last supported patch version by current client under Unix
2014-03-22 19:36:13 +01:00
kervala
98f33cfa87
Changed: Use RZ_USE_SEVENZIP instead of NL_USE_SEVENZIP
2014-03-22 18:20:30 +01:00
kervala
2076a6b13d
Changed: Typo
2014-03-22 16:23:28 +01:00
kervala
6c4d33c2a6
Changed: Improvements in patch system
2014-03-22 16:23:17 +01:00
kaetemi
2f19b88539
Fix crash in 0_setup.py on Linux
2014-03-15 09:12:40 +01:00
kaetemi
de9724a821
Add color to console output
2014-03-13 18:34:26 +01:00
kaetemi
b3cf16f263
Separate output directories from input directories
2014-03-12 19:19:52 +01:00
botanic
9661711c66
dont chmod just check permissions
2014-03-10 12:56:47 -07:00
kaetemi
c5f3c5d9d0
Compile fix
2014-03-02 21:43:24 +01:00
kaetemi
5a97a3aef0
Fix config
2014-03-02 01:37:20 +01:00
kaetemi
98fdfb672c
Cleanup config
2014-03-02 01:27:09 +01:00
kaetemi
2b5373e436
Fix duplicate config data
2014-03-02 01:13:48 +01:00
Cédric OCHS
c5e40670d9
Merged in StudioEtrange/ryzomcore/cmake-fixes (pull request #55 )
...
Cmake fix - FindWindowsSDK
2014-02-28 10:19:37 +01:00
botanic
d5d65ae56e
fixed cretion of users
2014-02-25 19:38:10 -08:00
kaetemi
dd97d5d41b
Remove duplicate cfg data
2014-02-21 20:39:24 +01:00
StudioEtrange
994c47dc92
fix find windows.h for winsdk8
...
--HG--
branch : cmake-fixes
2014-02-21 17:35:15 +01:00
StudioEtrange
646b8fc9ae
Fix bug cannot find right include folder for winsdk8
...
--HG--
branch : cmake-fixes
2014-02-21 16:40:04 +01:00
Jan Boon
fc835cbe6c
Merged in StudioEtrange/ryzomcore/ovqt-fixes (pull request #54 )
...
OVQT Plugins - CMake Install fixes
2014-02-21 04:53:06 +01:00
kaetemi
1764cfd708
Fix #138 Pointer truncation in AI Script VM
2014-02-21 03:17:54 +01:00
kaetemi
91d453dd63
Make packed sheets behaviour consistent accross services
2014-02-20 21:53:11 +01:00
kaetemi
020bfb775e
Disable build of dataset packed sheets in build pipeline
2014-02-20 20:15:18 +01:00
kaetemi
86f86c6170
Add additional executable permissions
2014-02-20 19:42:56 +01:00
kaetemi
72fac9aaf1
Update default directories
2014-02-20 03:37:23 +01:00
kaetemi
151e86bc9d
Add example configuration for patchman
2014-02-20 03:35:36 +01:00
kaetemi
d08c53aaf7
Remove unnecessary cfg
2014-02-20 03:13:30 +01:00
kaetemi
934f5c3f0b
Add script for creating a new shard patch
2014-02-20 03:09:31 +01:00
kaetemi
27da0870b2
Rename scripts
2014-02-20 01:31:09 +01:00
kaetemi
e8770db674
Nicer batch scripts for pipeline
2014-02-20 01:06:29 +01:00
kaetemi
b52230832e
Add build process script for shard sheets
2014-02-19 23:51:55 +01:00
kaetemi
2289285c14
Add AIS sheets to shard sheets packer tool
2014-02-19 00:40:04 +01:00
kaetemi
2555e93771
Add sheets packer tool for CTimeDateSeasonManager
2014-02-19 00:07:22 +01:00
kaetemi
30030220c1
Add EGS sheets to shard sheets packer tool
2014-02-18 23:50:55 +01:00
kaetemi
f65a48cc4b
Rename CSheets in GPM to CGpmSheets
2014-02-18 22:43:06 +01:00
kaetemi
32eafb179d
Add sheets packer tool for shard GPMS and CContinentContainer
2014-02-18 22:37:21 +01:00
kaetemi
accafc4192
Add sheets packer tool for shard MS and IOS
2014-02-18 22:19:56 +01:00
kaetemi
a6a72fd622
Fix #134 Exit crash after failed response from character selection
2014-02-17 13:57:26 +01:00
kaetemi
5c17bb1f8e
Make IG load waiting loop more agreeable
2014-02-17 01:54:12 +01:00
kaetemi
76ce7523ff
Additional streaming behaviour fix for XAudio2 driver
2014-02-17 00:20:29 +01:00
kaetemi
5ec390b0d6
Fix #132 You can no longer walk through rezzed players
2014-02-16 23:09:19 +01:00
kaetemi
49fa568123
Remove some debug
2014-02-16 20:44:58 +01:00
kaetemi
d680b70308
Fix some streaming behaviour in XAudio2 driver
2014-02-16 20:36:58 +01:00
StudioEtrange
0b8db2399c
CMAKE TARGET : SHARED and MODULE
...
About Shared Library (shared) and Module Library (module) type of cmake target
INSTALL command has different behaviour for ARCHIVE LIBRARY RUNTIME depending on the platform
2014-02-16 19:43:44 +01:00
botanic
e741f31a64
Merge
2014-02-15 19:56:43 -08:00
botanic
a96f651742
force deleting of file so it works even after server crash
2014-02-15 19:52:08 -08:00
kaetemi
be311fb0f8
Fix for excessive inlining of npc chat serialization, issue #97
...
--HG--
branch : compatibility
2014-02-14 18:36:15 +01:00
kervala
8adf6df76a
Changed: Minor changes
...
--HG--
branch : compatibility
2014-03-23 20:36:46 +01:00
kervala
a62393a9ed
Changed: Removed pwd command
...
--HG--
branch : compatibility
2014-03-23 20:36:05 +01:00
kervala
f4233222e5
Fixed: Removed chmod because useless
...
--HG--
branch : compatibility
2014-03-23 20:34:28 +01:00
kervala
c9651b257d
Fixed: Wrong parameters passed to bash script
...
--HG--
branch : compatibility
2014-03-23 20:32:44 +01:00
kervala
39eb83eb87
Changed: Use BuildName only on Unix
...
--HG--
branch : compatibility
2014-03-23 20:31:59 +01:00
kervala
058aa23813
Changed: Use official settings for client.cfg
...
--HG--
branch : compatibility
2014-03-23 20:27:55 +01:00
kervala
edf3f49afd
Changed: Use fullpath in batch file
...
--HG--
branch : compatibility
2014-03-23 20:27:09 +01:00
kervala
dfb187126a
Changed: Create .sh file under Unix
...
--HG--
branch : compatibility
2014-03-23 20:26:29 +01:00
kervala
91a3e128cc
Changed: Renamed RZ_PATCH to RZ_USE_PATCH
...
--HG--
branch : compatibility
2014-03-23 20:25:48 +01:00
kervala
769a5ca2ee
Changed: Don't patch "main_exedll" and "main_cfg" categories under Unix
...
--HG--
branch : compatibility
2014-03-22 19:36:53 +01:00
kervala
2c396827d5
Changed: Use "BuildName" from client_default.cfg to determinate last supported patch version by current client under Unix
...
--HG--
branch : compatibility
2014-03-22 19:36:13 +01:00
kervala
607f39561d
Changed: Use RZ_USE_SEVENZIP instead of NL_USE_SEVENZIP
...
--HG--
branch : compatibility
2014-03-22 18:20:30 +01:00
kaetemi
cd1107adf5
Fix #134 Exit crash after failed response from character selection
...
--HG--
branch : compatibility
2014-02-17 13:57:26 +01:00
kaetemi
d2d87d2644
Make IG load waiting loop more agreeable
...
--HG--
branch : compatibility
2014-02-17 01:54:12 +01:00
kaetemi
6426393210
Additional streaming behaviour fix for XAudio2 driver
...
--HG--
branch : compatibility
2014-02-17 00:20:29 +01:00
kaetemi
4d3d7a000a
Fix #132 You can no longer walk through rezzed players
...
--HG--
branch : compatibility
2014-02-16 23:09:19 +01:00
kaetemi
f703359eaa
Remove some debug
...
--HG--
branch : compatibility
2014-02-16 20:44:58 +01:00
kaetemi
17b99ba796
Fix some streaming behaviour in XAudio2 driver
...
--HG--
branch : compatibility
2014-02-16 20:36:58 +01:00
kervala
c26e4c7426
Changed: Typo
...
--HG--
branch : compatibility
2014-03-22 16:23:28 +01:00
kervala
20ce763f35
Changed: Improvements in patch system
...
--HG--
branch : compatibility
2014-03-22 16:23:17 +01:00
kaetemi
cb6661b10d
Fix for excessive inlining of npc chat serialization, issue #97
2014-02-14 18:36:15 +01:00
kaetemi
1bafddccf6
Fixup paths (could we use the search paths for this?)
2014-02-14 04:52:11 +01:00
kaetemi
62cf064982
Cleanup data_shard
2014-02-14 03:30:15 +01:00
kaetemi
5c4175a54d
Only copy if needed
2014-02-14 02:46:07 +01:00
kaetemi
74363fdb33
Merge
2014-02-14 02:38:53 +01:00
kaetemi
f0688ad8c6
Get path for datasets from config like other services
2014-02-14 02:37:41 +01:00
kaetemi
e569541faa
Fix default directory
2014-02-14 02:03:22 +01:00
kaetemi
106cd007f9
Move mirror sheets back in
2014-02-14 01:58:56 +01:00
kaetemi
497232b470
Extend shard data script to gather executables and configurations
2014-02-14 01:21:05 +01:00
kaetemi
3267b89362
Add directories for patchman to gamedata setup
2014-02-14 01:01:02 +01:00
kaetemi
9939219ebf
Extend shard data script
2014-02-13 22:02:25 +01:00
botanic
2e1b47e3f0
Backed out merge changeset: b2d97621fa3b
...
Backed out merge revision to its first parent (99840e8413f2)
2014-02-13 12:12:28 -08:00
kervala
6b04b77bdd
Fixed: Reverted i18n change
...
--HG--
branch : compatibility
2014-02-13 14:17:32 +01:00
kervala
ab7836187d
Fixed: Reverted OpenGLES support change
...
--HG--
branch : compatibility
2014-02-13 14:15:34 +01:00
kaetemi
f4dda130a6
Clean translation diffs from OLDVALUE comments before merge, issue #116 , patch provided by Łukasz K
2014-02-12 16:35:07 +01:00
kaetemi
4df290147b
Fix make_merge_wk for uxt
2014-02-10 16:38:04 +01:00
kaetemi
b1c485fde0
Cleanup
2014-02-09 22:35:01 +01:00
kaetemi
451a82e59e
Cleanup
2014-02-09 22:21:30 +01:00
kaetemi
ccf99f4f8e
Merge
2014-02-09 22:15:33 +01:00
kaetemi
4f2a1b7db2
Fix the bug that caused the shape exporter to crash
2014-02-09 22:12:44 +01:00
kaetemi
90c9028170
Cleanup
2014-02-09 21:53:49 +01:00
kaetemi
ada9e8da5d
Fix export of NeL Flare
2014-02-09 17:26:26 +01:00
botanic
b3cca9bd73
add_user code for AMS
2014-02-08 20:15:38 -08:00
botanic
96770ba2db
auto create ring user permissions
2014-02-08 19:26:11 -08:00
botanic
37c3aa49fa
Set permissions in the ams installer
2014-02-08 19:00:21 -08:00
botanic
ea6bec1f91
Backed out changeset: 7d3eaa1bada0
...
--HG--
branch : compatibility
2014-02-08 18:59:38 -08:00
botanic
c99bfa03d4
Set permissions in the ams installer
...
--HG--
branch : compatibility
2014-02-08 18:57:03 -08:00
Matthew Lagoe
0db3345130
Merged in nimetu/ryzomcore/shard-script-fixes-for-dash (pull request #47 )
...
Change shard scripts to work with dash shell (issue #99 )
2014-02-08 18:34:11 -08:00
Matthew Lagoe
3f04907c31
Merged in botanic/ryzomcore-botanic-testing (pull request #21 )
...
Make it so that bad text always throws a nlwarning
2014-02-08 18:33:27 -08:00
kaetemi
bd206db383
Remove pacs.packed_prims when done
2014-02-09 02:42:45 +01:00
kaetemi
9d5c9019b5
Move visual slot tab to separate directory
2014-02-09 02:40:14 +01:00
kaetemi
06e8090669
Skip some files in ig build when possible
2014-02-09 00:46:03 +01:00
kaetemi
13e3849c89
Fix typo
2014-02-08 23:57:39 +01:00
kaetemi
6ac551cf60
Implement skip for rbank process
2014-02-08 23:43:42 +01:00
kaetemi
f085e226c6
Implement skip for ig elevation
2014-02-08 22:54:25 +01:00
kaetemi
bd335d80c4
Implement skip for zone dependency process
2014-02-08 22:23:24 +01:00
kaetemi
3d2c60aac6
Get properties search paths from python variable
2014-02-08 22:07:33 +01:00
kaetemi
af65ca5c62
Fix lightmap optimize skip
2014-02-08 21:09:35 +01:00
kaetemi
38e353b5c6
Implement skip for coarse mesh build process
2014-02-08 21:02:24 +01:00
kaetemi
a0f86ebd39
Implement skip for shape lightmap optimize build process
2014-02-08 20:02:57 +01:00
kaetemi
01a115899b
Implement skip for interface build process
2014-02-08 19:44:52 +01:00
kaetemi
3f492d8b20
Add script to automatically merge translation wk files
2014-02-08 17:36:17 +01:00
kaetemi
6371fc324d
Add script to make and merge all translation diffs
2014-02-08 17:10:34 +01:00
kaetemi
6b19d30de0
Add short translation procedure readme
2014-02-08 17:01:13 +01:00
kaetemi
ac474c79b9
Compile fix
2014-02-08 16:29:15 +01:00
kaetemi
8dac3b82f3
Merge
2014-02-08 16:26:01 +01:00
kaetemi
74984f768a
Improve leveldesign_dev.bat
2014-02-08 16:24:56 +01:00
botanic
275542fa01
Added 7z library to all versions needed for in-game patcher
2014-02-07 20:12:15 -08:00
botanic
666ab7ebec
Added linux patcher!
2014-02-07 20:10:07 -08:00
botanic
e728daa7cd
Add CMAKE option and NVIDIA PerfHUD support
2014-02-07 19:49:40 -08:00
botanic
7518c066b3
Change frontend to use shard.ryzomcore.org by default
2014-02-07 19:32:10 -08:00
botanic
edd9381a3c
General ui fix's
2014-02-07 19:29:36 -08:00
kaetemi
afece9a65e
Merge with default
...
--HG--
branch : multipass-stereo
2014-02-08 02:58:22 +01:00
kaetemi
972d26ddde
Adjust default paths
2014-02-08 01:34:16 +01:00
kaetemi
b785192a5e
Add clause translation tool scripts
2014-02-08 01:03:01 +01:00
kaetemi
762a3b2655
Add translation tool scripts
2014-02-08 00:23:42 +01:00
kaetemi
62a4bec18c
Add translation directory to pipeline setup
2014-02-08 00:03:56 +01:00
kaetemi
25ee7f2595
Fix crash in translation_tools
2014-02-07 23:01:36 +01:00
kaetemi
7d05793cc9
Remove temporary file
2014-02-07 20:31:21 +01:00
kaetemi
50f0ebbb41
Copy refs in client install
2014-02-07 19:35:55 +01:00
kaetemi
ef03dcd294
Add refs to patch xml
2014-02-07 18:30:55 +01:00
kaetemi
9c9811f1b3
Reorder pipeline scripts
2014-02-07 18:10:09 +01:00
kaetemi
7736c5757c
Add world edit data install directory to pipeline setup
2014-02-07 18:04:23 +01:00
kaetemi
774cd59d8f
Update default paths for world editor
2014-02-07 17:47:43 +01:00
kaetemi
f3b6ab7052
Typo
2014-02-07 17:23:34 +01:00
kaetemi
0d0907aa08
Add build shadow skin to shape process
2014-02-07 17:16:40 +01:00
kaetemi
991bf1244f
Add some useful data to gamedev interfaces (temporary)
2014-02-07 15:53:35 +01:00
kaetemi
3fa19d91a5
Generate correct client.cfg data path for dev client
2014-02-07 15:26:15 +01:00
kaetemi
2619033972
Replace shard install script
2014-02-07 14:53:47 +01:00
kaetemi
680dfbd738
Remove duplicate tool
...
--HG--
branch : build_pipeline_py
2014-02-07 02:17:42 +01:00
kaetemi
40fe633dbe
Fix thread lockup in zone lighter
...
--HG--
branch : build_pipeline_py
2014-02-07 02:01:23 +01:00
kaetemi
5144770d9d
Backed out changeset: de1de16eef3b
...
--HG--
branch : build_pipeline_py
2014-02-07 01:49:39 +01:00
kaetemi
7219073bdc
Include world editor files directory in prim export
...
--HG--
branch : build_pipeline_py
2014-02-07 01:49:16 +01:00
kaetemi
1a0ee41780
Improve debug message
...
--HG--
branch : build_pipeline_py
2014-02-07 01:49:01 +01:00
kaetemi
31d5b54e74
Let prim checker only open files with ig extension
...
--HG--
branch : build_pipeline_py
2014-02-07 01:01:36 +01:00
kaetemi
240576ab9c
Add primitives directory to rbank lookup (needed file_index.cfg - is this the correct primitives dir?)
...
--HG--
branch : build_pipeline_py
2014-02-07 01:01:19 +01:00
kaetemi
f5c30593c8
Merge with default
...
--HG--
branch : build_pipeline_py
2014-02-07 00:11:12 +01:00
kaetemi
2c4ca0d915
Include world editor files in rbank process, part of what caused water not to build
...
--HG--
branch : build_pipeline_py
2014-02-06 23:58:18 +01:00
kaetemi
32ca8d61fe
Add more paths to the build gamedata configuration
...
--HG--
branch : build_pipeline_py
2014-02-06 23:49:54 +01:00
kaetemi
b53926014d
Remove weather configuration from data common
...
--HG--
branch : build_pipeline_py
2014-02-06 23:39:05 +01:00
kaetemi
439ba0713e
Build pacs prim list txt outside repository
...
--HG--
branch : build_pipeline_py
2014-02-06 22:10:56 +01:00
kaetemi
dfb2815bcd
Add separate target directory for shard data
...
--HG--
branch : build_pipeline_py
2014-02-06 21:44:14 +01:00
kaetemi
6f7e5e7c72
Update default paths
...
--HG--
branch : build_pipeline_py
2014-02-06 20:31:43 +01:00
kaetemi
11c9f6a91b
Merge with default
...
--HG--
branch : build_pipeline_py
2014-02-06 20:16:18 +01:00
kaetemi
48d2c22639
Merge with default
...
--HG--
branch : kaetemi-cleanup
2014-02-06 19:54:15 +01:00
Matthew Lagoe
b63e2a7a8e
Merged in nimetu/ryzomcore/shard-admin-tool-mysqli-class (pull request #49 )
...
mysqli class for shard admin tool
2014-02-05 13:14:50 -08:00
Matthew Lagoe
d3912094cf
Merged in nimetu/ryzomcore/php-mysqli-refactor-fixed (pull request #48 )
...
Replace deprecated mysql functions with mysqli in login and ring scripts
2014-02-05 13:05:14 -08:00
botanic
231a6b2e64
remove sleep on ams install
2014-02-05 13:04:18 -08:00
kaetemi
89a2a2ce99
Do not select stereo display debugger when HMD is set to Auto in Snowballs
2014-02-04 20:52:15 +01:00
kaetemi
8de55c4cc5
Fix georges sound plugin compilation
2014-02-04 19:21:13 +01:00
kaetemi
ca31e78f7c
Remove georges4cvs feature
2014-02-03 01:25:02 +01:00
kaetemi
bcb2f48940
Remove georges4cvs feature
2014-02-03 00:16:35 +01:00
Jan Boon
9062bea4a8
Merged ryzom/ryzomcore into default
2014-02-02 00:52:25 +01:00
kaetemi
2256b2ce15
Properly handle NeL dependencies for Ryzom tools when disabling NeL libraries
2014-02-02 00:47:33 +01:00
kervala
3980513e12
Fixed: Compilation with freetype under Linux
2014-02-01 13:59:47 +01:00
kervala
0c31ab50bf
Changed: CMAKE_OSX_DEPLOYMENT_TARGET is useless because CMake set it automatically based on MACOSX_DEPLOYMENT_TARGET
2014-01-30 16:26:16 +01:00
kervala
c9a9839ce6
Fixed: Compilation under Mac OS X 10.9 (new libc++ tr1 namespace is std not std::tr1)
2014-01-30 16:14:25 +01:00
kervala
1c50b1f943
Fixed: Compilation under Mac OS X 10.9
2014-01-30 14:43:51 +01:00
Nimetu
cd4ba6e579
Removed debug output
...
--HG--
branch : shard-admin-tool-mysqli-class
2014-01-29 14:11:08 +02:00
Nimetu
db00b5002d
Add mysqli database class to shard admin tool
...
--HG--
branch : shard-admin-tool-mysqli-class
2014-01-29 14:06:48 +02:00
kervala
19cc4571d3
Fixed: Don't set CMAKE_OSX_DEPLOYMENT_TARGET anymore by default, only use that if you need
2014-01-29 13:06:22 +01:00
botanic
e995784886
Fixed typo issue 60
2014-01-28 11:41:26 -08:00
Nimetu
e3c3d6a4b7
Replace deprecated mysql functions with mysqli in login and ring scripts
...
--HG--
branch : php-mysqli-refactor-fixed
2014-01-28 00:47:13 +02:00
Nimetu
6f1dc626bd
Change shard scripts to work with dash shell (issue #99 )
...
Fix 'Press ENTER key' functionality
--HG--
branch : shard-script-fixes-for-dash
2014-01-27 23:15:31 +02:00
botanic
71b0f9ae92
Issue #60
...
does seem to work better when latency is high
2014-01-26 03:20:00 -08:00
botanic
60495f79ac
Merge
2014-01-26 02:58:42 -08:00
botanic
b6441edf2d
Fix for Issue #94
2014-01-26 02:57:59 -08:00
kervala
a5a9532a13
Changed: Best fix for Freetype new layout (we only just need to include ft2build.h as done in font_generator.h)
2014-01-26 11:03:33 +01:00
botanic
5317c9f080
Backed out php-mysqli-refactor, broke logins
2014-01-26 01:31:47 -08:00
liria
16dbe48ed5
use NEL CFile function for file test
...
--HG--
branch : lightmap_optimizer_port_to_linux
2014-01-25 17:09:07 +01:00
liria
a6d9521ae6
Merged default into lightmap_optimizer_port_to_linux
...
--HG--
branch : lightmap_optimizer_port_to_linux
2014-01-25 13:52:12 +01:00
liria
54c53255b1
make the programm compile on linux plateform
...
--HG--
branch : lightmap_optimizer_port_to_linux
2014-01-25 11:50:14 +01:00
kervala
09e3471f1b
Fixed: Compilation with freetype
2014-01-25 10:45:57 +01:00
kervala
43c48ad36a
Changed: Enable ig_elevation everywhere (patch by Liria)
2014-01-23 13:08:11 +01:00
liria
41a475b8f3
Merged default into ig_elevaton_port_to_linux
...
--HG--
branch : ig_elevaton_port_to_linux
2014-01-23 00:49:56 +01:00
liria
ac48221c8b
CMakeLists.txt edited online with Bitbucket - remove merge conflict with default branche
...
--HG--
branch : ig_elevaton_port_to_linux
2014-01-22 23:49:11 +00:00
kervala
ee8edac294
Fixed : #96 cmake and freetype detection on Linux Debian SID
2014-01-22 10:24:35 +01:00
kaetemi
207d7323ce
Fix Qt build on Windows
2014-01-21 12:50:23 +01:00
Nimetu
11e5515c5c
Replace deprecated mysql functions with mysqli in login and ring scripts
...
--HG--
branch : php-mysqli-refactor
2014-01-10 14:00:09 +02:00
Nimetu
ea5a36b105
Remove tooltip debug message from logs
...
--HG--
branch : misc-patches
2014-01-04 00:20:05 +02:00
Nimetu
5b09380bff
Hide over the limit landmarks instead deleting them
...
--HG--
branch : misc-patches
2014-01-03 22:43:00 +02:00
Nimetu
4c2531474a
Fix typo (issue #70 )
...
--HG--
branch : misc-patches
2014-01-03 19:51:50 +02:00
Nimetu
0bad9f2f5e
Fix inventory items draggable state (issue #78 )
...
--HG--
branch : misc-patches
2014-01-03 20:31:14 +02:00
Nimetu
3cd6ecdb82
Add deadlock counter to prevent endless loop (issue #73 )
...
--HG--
branch : misc-patches
2014-01-03 19:11:49 +02:00
botanic
935ea04c58
dont force null driver, doesnt work on all cards and disable maximising max while running pipeline
2013-12-30 10:03:49 -08:00
botanic
db3a789ab4
un kaetemi'd the pipeline
2013-12-30 08:59:59 -08:00
botanic
2c0d64e8ff
added single bat file to run whole pipeline
2013-12-29 23:25:09 -08:00
botanic
15452f47d3
fixed permissions
2013-12-18 11:45:10 -08:00
botanic
92f8e4ffa8
changed client_default to use shard
2013-12-17 06:54:27 -08:00
botanic
c275d0f7d8
ams needs some urls editable without recompiling
2013-12-17 05:10:28 -08:00
botanic
32cfdada54
fixed permissions on default admin account
2013-12-17 04:59:53 -08:00
botanic
52d4d3c0f5
added the install for ring_open
2013-12-17 00:07:09 -08:00
botanic
0a48856319
a positive and a negative is supposted to be NEGATIVE stupid php
2013-12-16 23:38:24 -08:00
botanic
31de51af19
updated words file
2013-12-16 23:19:29 -08:00
botanic
8aa71de2bc
helps if i use the right file...
2013-12-16 23:14:24 -08:00
botanic
8cbc6f01ec
forgot a few ;
2013-12-16 23:11:30 -08:00
botanic
4e4d925e54
fixed some permissions issues, setup system so that it has a is_installed file to determin if it should install or not
2013-12-16 22:59:06 -08:00
botanic
09e5cfc5ef
Merge
2013-12-14 19:36:36 -08:00
botanic
fe3a7c0e1c
fix for new install
2013-12-14 19:34:07 -08:00
kervala
291c961776
Changed: #71 Crash when entering rooms (patch provided by Tierry Anthony, thanks!)
2013-12-14 09:18:51 +01:00
kervala
19f7bc931e
Fixed: Warning "LNK4224: /INCREMENTAL:YES is no longer supported"
2013-11-22 11:27:30 +01:00
kervala
6196077160
Changed: #85 Compilation with STLport + EOL
2013-11-22 11:25:53 +01:00
kervala
986edb216f
Fixed : #85 Compilation with STLport
2013-11-22 11:25:12 +01:00
kervala
c718ff693a
Fixed: Assign instead of comparison
2013-11-22 11:20:07 +01:00
"picomancer ext:(%22)
12f646afef
README: Update URL for build instructions, fix typo
2013-11-13 17:25:12 -05:00
kervala
ae5becbb0b
Fixed: Warning with clang
2013-11-13 22:53:26 +01:00
kervala
98c862136a
Changed: Manual -isysroot and -mmacosx-version-min useless because already set by CMake
2013-11-13 22:52:48 +01:00
kervala
b219623129
Fixed: Verbose warning
2013-11-13 22:23:57 +01:00
kervala
b96ad682f5
Fixed: Compilation under Mac OS X
2013-11-13 22:23:24 +01:00
kervala
a45bbd96c5
Fixed: Warning with clang
2013-11-13 22:23:02 +01:00
kervala
af1721a0a4
Changed: Don't need to change _PolygonSmooth if value is the same
2013-11-13 21:55:14 +01:00
kervala
166607f644
Changed: Implement VSync under Mac OS X
2013-11-13 21:54:45 +01:00
kervala
73196fe7fe
Changed: Replace strlwr by toLower
2013-11-13 21:53:21 +01:00
kervala
b46c316940
Fixed : #77 crash when using lua:parseInterfaceFromString() (a big thanks to nimetu for the fix !)
2013-11-13 21:52:21 +01:00
kervala
dda2215ed8
Fixed: Wrong algorithm
2013-11-13 21:46:42 +01:00
kervala
6b3b85962a
Changed: EOL
2013-11-13 21:45:06 +01:00
kervala
d8a6c9f966
Fixed: Warning with clang
2013-11-13 21:40:41 +01:00
kervala
8099217145
Changed: Replaced math.mod by math.fmod in Ring lua files
2013-11-13 21:38:23 +01:00
kervala
36a537a88e
Changed: Replaced atof by fromString
2013-11-13 21:37:28 +01:00
kervala
0ce9bca0ac
Changed: Replaced strlwr by toLower
2013-11-13 21:33:29 +01:00
kervala
b7082644f0
Changed: Updated OpenGL registry
2013-11-13 20:31:08 +01:00
botanic
be87039624
added reload link to if config permissions are wack
2013-11-11 13:23:33 -08:00
botanic
80e168886a
properly write the hostname for permissions creation
2013-11-11 13:17:19 -08:00
botanic
036dac452f
changed it to error on bad permissions copying config.php
2013-11-11 10:54:09 -08:00
Botanic
6dfafa7ae1
Merge
2013-11-02 16:35:26 -07:00
kervala
588d262dbf
Fixed: MFC can't be found
2013-10-30 20:46:19 +01:00
sfb
59abfb8a1d
Bad logging, content is unsigned const char*, fixed it to use %s and not cast.
...
--HG--
branch : gsoc2011-worldeditorqt
2013-10-28 12:58:08 -05:00
sfb
df7110d2d6
Bad merge resolution, fixed a couple source files which merged poorly.
...
--HG--
branch : gsoc2011-worldeditorqt
2013-10-28 11:24:31 -05:00
sfb
d86f150caa
Bad merge resolution, fixed the build files that merged poorly.
...
--HG--
branch : gsoc2011-worldeditorqt
2013-10-28 11:24:02 -05:00
Matthew Lagoe
61f021f635
Merged in botanic/rc-botanic-webdev/rc-botanic-webdev (pull request #43 )
...
added rrd_graphs directory
2013-10-26 20:59:38 -07:00
Botanic
9e67d9ea09
added rrd_graphs directory
...
--HG--
branch : rc-botanic-webdev
2013-10-26 20:57:16 -07:00
Botanic
4c5832204f
config.default.php
2013-10-26 03:19:59 -07:00
Botanic
3e692705ea
added folder placeholders
2013-10-26 02:04:54 -07:00
Botanic
7381de073e
fixed bad merge
2013-10-26 00:57:50 -07:00
Botanic
057fe3e0f7
Merge
2013-10-26 00:50:56 -07:00
Botanic
b6de1eca23
Changed installer page to no_visible_elements
...
--HG--
branch : rc-botanic-webdev
2013-10-24 21:58:11 -07:00
Botanic
284884c573
added installer for nel_tool database
...
--HG--
branch : rc-botanic-webdev
2013-10-24 20:25:04 -07:00
Botanic
a3cbd69d3b
fixed css
...
--HG--
branch : rc-botanic-webdev
2013-10-24 05:43:38 -07:00
Botanic
03a1dc39af
made logo clickable
...
--HG--
branch : rc-botanic-webdev
2013-10-24 05:03:01 -07:00
Botanic
2d174cf15c
fixed more warnings
...
--HG--
branch : rc-botanic-webdev
2013-10-24 04:43:42 -07:00
Botanic
b8fdefe10d
fixed php warning
...
--HG--
branch : rc-botanic-webdev
2013-10-24 04:10:39 -07:00
Botanic
04619a39a9
made users a dropdown for adding users to group
...
--HG--
branch : rc-botanic-webdev
2013-10-24 02:21:43 -07:00
Botanic
632a6f2929
fixed missing </div>
...
--HG--
branch : rc-botanic-webdev
2013-10-24 01:25:05 -07:00
Botanic
91c4784752
Fixed Support Groups
...
--HG--
branch : rc-botanic-webdev
2013-10-24 01:12:09 -07:00
Botanic
81d1cf93fb
added option for assigned and unassigned ie "both"
...
--HG--
branch : rc-botanic-webdev
2013-10-23 23:58:34 -07:00
Botanic
d1913cbfc5
fixed div in settings template
...
--HG--
branch : rc-botanic-webdev
2013-10-23 18:35:44 -07:00
Botanic
c4e79a8246
fixed some more static non-static warnings
...
--HG--
branch : rc-botanic-webdev
2013-10-23 18:26:59 -07:00
Botanic
6b266fd808
fixed missing index errors
...
--HG--
branch : rc-botanic-webdev
2013-10-23 18:07:09 -07:00
Botanic
8ca55f955e
fixed groupid if there are no groups
...
--HG--
branch : rc-botanic-webdev
2013-10-23 17:12:47 -07:00
Botanic
677c8fa251
cleanup sync
...
--HG--
branch : rc-botanic-webdev
2013-10-23 17:08:27 -07:00
Botanic
3dbb08f1d1
fixed static call to non static
...
--HG--
branch : rc-botanic-webdev
2013-10-23 17:06:42 -07:00