Commit graph

1673 commits

Author SHA1 Message Date
sfb
4462383a26 reverting log plugin to rev 1660 2011-08-04 09:21:38 -05:00
cemycc
44804ea770 Changed: #1307 Added some features and making little modifications
--HG--
branch : gsoc2011-translationovqt
2011-08-04 17:19:17 +03:00
sfb
bdac2b9489 merge branch-mission-compiler-qt into default 2011-08-04 08:44:18 -05:00
cemycc
23f1309995 Changed: #1307 Added Phrase editor files and base functions
--HG--
branch : gsoc2011-translationovqt
2011-08-03 23:08:56 +03:00
sfb
bd2768ec89 Added: 3rd party library - Qt Property Browser 2.5
--HG--
branch : branch_ovqt_3rdparty
2011-08-03 07:51:10 -05:00
cemycc
6fb8d197cf Changed: #1307 Added the base files for phrase editor and new method to save the editor type
--HG--
branch : gsoc2011-translationovqt
2011-07-27 01:01:00 +03:00
Fabien_HENON
1f057afe91 Changed: #1304: Message concerning the number of times a mission needs to be completed
--HG--
branch : gsoc2011-guildmissions
2011-07-25 14:09:13 +02:00
Fabien_HENON
6462021f14 Changed: #1304: Update of CMissionStepDoMissions to support missions done several times (by different guild members)
--HG--
branch : gsoc2011-guildmissions
2011-07-25 12:27:19 +02:00
Fabien_HENON
78dbefb759 Changed: #1304: Checks in the mission compiler if the do_mission objective is correct (for a guild mission) when we add a number (the number of members from the guild needed to complete the mission) after a mission name
--HG--
branch : gsoc2011-guildmissions
2011-07-23 18:14:31 +02:00
Fabien_HENON
9f05d66a81 Changed: #1304: Revert modifications for the objectives in the mission compiler (i changed the way i will do it)
--HG--
branch : gsoc2011-guildmissions
2011-07-23 15:56:32 +02:00
Fabien_HENON
12fe8693d5 Changed: #1304: Revert modifications for the objectives in the world_editor_classes.xml (i changed the way i will do it)
--HG--
branch : gsoc2011-guildmissions
2011-07-23 15:51:46 +02:00
sfb
a5c0026d23 Update: Fixed a specific crash when only one server was checked and configured. Added mission publication.
--HG--
branch : branch-mission-compiler-qt
2011-07-20 15:39:23 -05:00
Fabien_HENON
5762e00236 Changed: #1304: Implementation of the "guild" parameter for the "destroy_item" action
--HG--
branch : gsoc2011-guildmissions
2011-07-20 22:09:01 +02:00
Fabien_HENON
757f393db1 Changed: #1304: Implementation of the "guild" parameter for the "recv_named_item" action
--HG--
branch : gsoc2011-guildmissions
2011-07-20 21:08:53 +02:00
Fabien_HENON
5ac224b5af Changed: #1304: Implementation of the "guild" parameter for the "recv_item" action
--HG--
branch : gsoc2011-guildmissions
2011-07-20 20:33:52 +02:00
sfb
a431e62539 Update: Completed settings page, loading and saving of settings and preferences (checked publish servers.) Changed namespace from 'Plugin' to 'MissionCompiler'.
--HG--
branch : branch-mission-compiler-qt
2011-07-20 12:54:30 -05:00
Fabien_HENON
cb6b4ac917 Changed: #1304: Implementation of the "guild" parameter for the "recv_fame" action
--HG--
branch : gsoc2011-guildmissions
2011-07-20 18:41:30 +02:00
Fabien_HENON
af4d2d6236 Changed: #1304: Implementation of the "guild" parameter for the "recv_money" action
--HG--
branch : gsoc2011-guildmissions
2011-07-19 19:10:12 +02:00
Fabien_HENON
2d1ce64c38 Changed: #1304: Parsing the "guild" parameter for the actions that need it.
--HG--
branch : gsoc2011-guildmissions
2011-07-19 18:39:29 +02:00
Fabien_HENON
185603b5e6 Changed: #1304: Debug of the options added in the script (';' replaced by ':' for parameters separation)
--HG--
branch : gsoc2011-guildmissions
2011-07-19 18:10:28 +02:00
sfb
63caf64438 merge default
--HG--
branch : branch-mission-compiler-qt
2011-07-18 21:30:28 -05:00
Fabien_HENON
875d46f9b5 Changed: #1304: Implementation of the cbClientGroupAbandonMission for the guilds
--HG--
branch : gsoc2011-guildmissions
2011-07-18 19:37:59 +02:00
cemycc
cfa7244074 Added #1307 Full support for FTP merge options and icons for FTP window. This is the last commit for the first milestone.
--HG--
branch : gsoc2011-translationovqt
2011-07-15 00:38:16 +03:00
cemycc
10d5831ac4 Changed: #1307 I have clean my branch, removing temp files
--HG--
branch : gsoc2011-translationovqt
2011-07-13 22:34:00 +03:00
cemycc
6fbe07b6f4 Changed: #1307 Added Undo Commands for edit, insertand delete items on table and for words extraction
--HG--
branch : gsoc2011-translationovqt
2011-07-13 19:47:15 +03:00
cemycc
8ad55aae36 Changed: #1307 Fixing a bug with the extraction options
--HG--
branch : gsoc2011-translationovqt
2011-07-13 10:39:39 +03:00
cemycc
d035dfcb05 Changed: #1307 Minor fix on QMainWindow reported here: http://ryzomcore.etherpad.opennel.org/12
--HG--
branch : gsoc2011-translationovqt
2011-07-13 01:43:42 +03:00
cemycc
03e08b730a Changed: #1307 Added implementation of undo/redo framework partial
--HG--
branch : gsoc2011-translationovqt
2011-07-12 22:02:05 +03:00
dnk-88
15d72ea9e7 Changed: Improved performance landscape plugin under Linux. 2011-07-10 01:10:41 +03:00
cemycc
4c01411840 Added: #1307 Ui deffs for merge source selection and ftp selection
--HG--
branch : gsoc2011-translationovqt
2011-07-08 18:31:59 +03:00
cemycc
bc6096ff61 merge from default
--HG--
branch : gsoc2011-translationovqt
2011-07-08 18:28:58 +03:00
cemycc
766420cd11 Added: #1307 Merge options for translation files from local directory and from FTP server
--HG--
branch : gsoc2011-translationovqt
2011-07-08 18:22:51 +03:00
dnk-88
22175df8d3 Changed: Fixed crash ovqt, when clicked on the apply button in settings dialog. 2011-07-08 00:56:05 +03:00
dnk-88
ae0a26855f Changed: #1303 Added icons for undo/redo actions. 2011-07-06 21:53:28 +03:00
cemycc
d54daf3ef2 Added: #1307 Added extraction from primitives
--HG--
branch : gsoc2011-translationovqt
2011-07-06 04:56:58 +03:00
cemycc
a4f222c651 Changed: #1307 Added extraction words options for: item, creature, sbrick, sphrase
--HG--
branch : gsoc2011-translationovqt
2011-07-05 05:01:13 +03:00
Fabien_HENON
e46422c041 Changed: #1304: Add implementation of functions to process mission events for guild missions
--HG--
branch : gsoc2011-guildmissions
2011-07-04 15:57:02 +02:00
Fabien_HENON
e92762ad8b Changed: #1304: Adding mission histories for CGuild
--HG--
branch : gsoc2011-guildmissions
2011-07-04 15:06:11 +02:00
Fabien_HENON
74a6cc26e6 Changed: #1304: Adding guild mission support in functions acceptExchange and processMissionEventList of the CCharacter class
--HG--
branch : gsoc2011-guildmissions
2011-07-04 13:57:11 +02:00
Fabien_HENON
c175338c7f Changed: #1304: Adding Guild mission support in function tickUpdate of CCharacter
--HG--
branch : gsoc2011-guildmissions
2011-07-04 12:38:42 +02:00
cemycc
e55bbed5b4 Changed: #1307 New structure for subwindows from QMdiArea
--HG--
branch : gsoc2011-translationovqt
2011-07-01 21:51:41 +03:00
sfb
db7a3321c2 Merging default changes into branch.
--HG--
branch : branch-mission-compiler-qt
2011-07-01 07:21:59 -05:00
sfb
c83fd1832b Changed: Implementing server list in settings page. Added dialog for editing/adding entries. Can add, remove and edit entries. Still need to implement read/write settings and provide a method to connect the table to the publishing options table.
--HG--
branch : branch-mission-compiler-qt
2011-07-01 07:19:46 -05:00
Fabien_HENON
19cfe26032 Changed: #1304: Implementation of basic CGuild functions for guild missions
--HG--
branch : gsoc2011-guildmissions
2011-06-29 14:44:30 +02:00
cemycc
f19ebefbe6 Changed: #1307 Added option to extract the botnames from primitives.
--HG--
branch : gsoc2011-translationovqt
2011-06-27 03:02:21 +03:00
cemycc
fe125bbaeb Changed: #1307 Added option for SaveAs and a windows list
--HG--
branch : gsoc2011-translationovqt
2011-06-26 05:48:28 +03:00
cemycc
ed92fd2a78 Changed: #1307 Added editor for worksheet files.
--HG--
branch : gsoc2011-translationovqt
2011-06-25 16:42:45 +03:00
cemycc
32c07d0b62 Changed: #1307 Added extract_bot_names
--HG--
branch : gsoc2011-translationovqt
2011-06-21 01:03:54 +03:00
Fabien_HENON
a7f4bfa718 Changed: #1304: Add guild missions prerequisites.
--HG--
branch : gsoc2011-guildmissions
2011-06-20 16:08:12 +02:00
Fabien_HENON
ef009ebc90 Changed: #1304: Instanciation of guild missions.
--HG--
branch : gsoc2011-guildmissions
2011-06-20 15:15:07 +02:00
kervala
68ab06f7c0 Changed: Updated client_default.cfg.in from client_default.cfg 2011-06-14 20:11:44 +02:00
kervala
75ce27ad45 Added: Option WITH_STATIC_EXTERNAL to force FIND_LIBRARY to find static libs 2011-06-14 20:11:17 +02:00
kervala
d52dead6af Changed: Merge changes from next patch 2011-06-14 19:34:28 +02:00
kervala
7adc1ec629 Changed: #878 Fix typos in comments/code 2011-06-14 19:31:59 +02:00
cemycc
624cb70813 Changed: #1307 Update the plugin to work with the latest plugin system
--HG--
branch : gsoc2011-translationovqt
2011-06-14 18:01:21 +03:00
dnk-88
5c47e96d79 Added: #1303 Added undo/redo command list. 2011-06-14 13:29:16 +03:00
sfb
c41a312a86 Changed: Fixed the 'QMetaObject' linking error and commented out most of the old code to be replaced.
--HG--
branch : branch-mission-compiler-qt
2011-06-11 08:48:16 -05:00
sfb
36445503cd merge from default
--HG--
branch : branch-mission-compiler-qt
2011-06-09 14:29:05 -05:00
sfb
ba23190a9d Changed: Started to add dialogs for server and publishing settings.
--HG--
branch : branch-mission-compiler-qt
2011-06-09 14:26:02 -05:00
vl
0e3465b6a1 Changed: chapter 5 2011-06-09 00:36:58 +02:00
vl
529edfcb9a Fixed: must not be lowered or the tooltip in milkopad doesn't work 2011-06-08 18:36:27 +02:00
cemycc
f90215a550 merge from default
--HG--
branch : gsoc2011-translationovqt
2011-06-08 14:51:07 +03:00
kervala
b7eefef484 Changed: #1177 VS 2010 does not work under CMake 2011-06-08 11:46:11 +02:00
kervala
74c2952c32 Changed: #1275 Create an OpenGL ES driver 2011-06-08 10:16:44 +02:00
kervala
0f63f56969 Changed: Replaced NLMISC::strlwr by NLMISC::toLower 2011-06-08 10:15:16 +02:00
kervala
e4fba623dc Fixed: Bad font default size 2011-06-08 10:14:48 +02:00
kervala
81d2817c44 Changed: #878 Fix typos in comments/code 2011-06-08 10:14:14 +02:00
sfb
884017a65d Changed: Mission Compiler add/remove selected/all and reset filter functions.
--HG--
branch : branch-mission-compiler-qt
2011-06-07 14:30:34 -05:00
sfb
21db83a0ed Changed: Added 'data directory' box and re-arranged filters.
--HG--
branch : branch-mission-compiler-qt
2011-06-07 12:14:10 -05:00
kervala
23e49c5f27 Merge 2011-06-07 16:41:08 +02:00
kervala
4ab971d2fe Changed: #878 Fix typos in comments/code 2011-06-07 15:58:18 +02:00
Fabien_HENON
c4d39b2f98 Changed: #1304: Updating CMissionGuild for guild missions.
Implementation of the functions:
- updateUsersJournalEntry
- clearUsersJournalEntry

--HG--
branch : gsoc2011-guildmissions
2011-06-07 14:42:00 +02:00
cemycc
b7a5722150 merge from default
--HG--
branch : gsoc2011-translationovqt
2011-06-06 20:39:54 +03:00
kervala
4027e82360 Changed: #825 Remove all warnings when compiling Ryzom 2011-06-05 18:06:00 +02:00
kervala
5cd98b6e45 Changed: Replaced NLMISC::strlwr by NLMISC::toLower 2011-06-05 17:52:40 +02:00
kervala
f0f64cab63 Changed: Merge changes from next patch 2011-06-04 14:20:01 +02:00
kervala
e254253fe0 Fixed: Number of processors under Linux 2011-06-04 14:01:56 +02:00
kervala
0cbb87bfe1 Fixed: Strings buffer overflow in config files 2011-06-04 14:01:32 +02:00
kervala
0913c3d667 Changed: #878 Fix typos in comments/code 2011-06-04 13:51:03 +02:00
kervala
7fd0b6fb7d Changed: Display unknown status in FBO errors messages 2011-06-04 13:50:33 +02:00
kervala
b4e09b1adc Fixed: X extensions list is truncated 2011-06-04 13:49:41 +02:00
kervala
f03da8e338 Changed: #878 Fix typos in comments/code 2011-06-04 13:48:27 +02:00
kervala
2a3e170bee Changed: #142 Replace atoi and sscanf by fromString when it's possible 2011-06-04 13:25:58 +02:00
kervala
8350856a05 Changed: Merge changes from next patch 2011-06-04 13:23:14 +02:00
kervala
714bb3aa3b Changed: #878 Fix typos in comments/code 2011-06-03 15:17:23 +02:00
kervala
231d6ce32a Fixed: PCH problems with CMake 2.6 2011-06-03 13:59:08 +02:00
kervala
16460bcf97 Changed: #825 Remove all warnings when compiling Ryzom 2011-06-03 10:51:03 +02:00
kervala
7a081ca8b5 Changed: Exceptions catched by reference 2011-06-03 10:42:40 +02:00
kervala
7c27c233eb Changed: Exceptions catched by reference 2011-06-03 10:35:25 +02:00
kervala
58acd2e969 Fixed: #1310 Broken build with VS 2k8 nmake 2011-06-03 10:07:52 +02:00
kervala
2497d88522 Fixed: #1310 Broken build with VS 2k8 nmake 2011-06-03 09:23:12 +02:00
sfb
f7ebb89d94 Changed: Implemented basic mission compilation without publishing.
--HG--
branch : branch-mission-compiler-qt
2011-06-02 15:15:12 -05:00
sfb
9e3a19e654 Changed: Implemented mission validation.
--HG--
branch : branch-mission-compiler-qt
2011-06-02 13:47:31 -05:00
kervala
043b845f6c Changed: Exceptions catched by reference 2011-06-02 18:44:48 +02:00
kervala
1312ede370 Changed: Exceptions catched by reference 2011-06-02 18:43:58 +02:00
kervala
f9cc842b82 Changed: Exceptions catched by reference 2011-06-02 18:31:40 +02:00
kervala
2d80b547fc Changed: Merge changes from next patch 2011-06-02 17:28:30 +02:00
kervala
d4a78b6fd1 Changed: Merge changes from next patch 2011-06-02 17:26:04 +02:00
sfb
00e65b1015 Changed: Added some more UI tweaks - most of the UI design is now done.
--HG--
branch : branch-mission-compiler-qt
2011-06-01 18:41:01 -05:00
sfb
bdbeaa29e8 Changed: Initial footwork on OVQT-based mission compiler plugin.
--HG--
branch : branch-mission-compiler-qt
2011-06-01 07:45:55 -05:00