Commit graph

2105 commits

Author SHA1 Message Date
SirCotare
ad0bbe922f #1470 base class update; AVL trees added; some cleanup
--HG--
branch : gsoc2012-achievements
2012-07-01 20:04:01 +02:00
kaetemi
d79e04e4dd Fixed: Valgrind warnings 2012-06-28 11:30:58 +02:00
kaetemi
e9f75e639d Fixed: Valgrind warnings 2012-06-28 11:08:36 +02:00
SirCotare
a02851452b #1470 monday's push_all
--HG--
branch : gsoc2012-achievements
2012-06-25 22:00:02 +02:00
SirCotare
a42d6d9a76 #1470 achievement API for external data access
--HG--
branch : gsoc2012-achievements
2012-06-25 21:16:42 +02:00
SirCotare
7d976a22ad #1470 admin tool workprint; menu admin almost complete; wip!!
--HG--
branch : gsoc2012-achievements
2012-06-25 15:04:51 +02:00
SirCotare
a3d40de283 #1470 major update; these changes were necessary for the admin tool; currently untested - need new testserver with php 5.4
--HG--
branch : gsoc2012-achievements
2012-06-25 15:03:14 +02:00
SirCotare
a874eb6f04 #1470 some minor rendering fixes; Parentum is now abstract class; various adaptations to allow admin functions to inherit from these base classes
--HG--
branch : gsoc2012-achievements
2012-06-24 12:44:24 +02:00
SirCotare
7d140cb037 #1470 Parentum interface debugged...
--HG--
branch : gsoc2012-achievements
2012-06-21 22:45:27 +02:00
SirCotare
8886ed94b7 #1470 interface for inheritable child generation added
--HG--
branch : gsoc2012-achievements
2012-06-21 22:28:51 +02:00
SirCotare
139be8d7dd #1470 config options added; some cleanup
--HG--
branch : gsoc2012-achievements
2012-06-21 22:03:36 +02:00
SirCotare
3056f7b8e7 #1470 and here comes the ingame rendering
--HG--
branch : gsoc2012-achievements
2012-06-21 20:55:52 +02:00
SirCotare
bd822e3827 #1470 XMLApi connector initially finished; testing needed
--HG--
branch : gsoc2012-achievements
2012-06-18 21:17:44 +02:00
SirCotare
4e806d0956 #1470: data retrieval updates, though untested
--HG--
branch : gsoc2012-achievements
2012-06-18 19:49:40 +02:00
SirCotare
f39db9b0ca #1470 added dev flags
--HG--
branch : gsoc2012-achievements
2012-06-14 11:23:52 +02:00
SirCotare
c37c08ef53 #1470 achievement admin initial
--HG--
branch : gsoc2012-achievements
2012-06-11 18:53:04 +02:00
SirCotare
8aeabcd247 #1470 monday's commit: update on parser (still incomplete); wip datasources; initial monitoring cronjob (done); various minor changes, fixes and so
--HG--
branch : gsoc2012-achievements
2012-06-11 18:52:19 +02:00
kaetemi
67c2eb523f Changed: Different default type id for sound sheet id workaround 2012-06-05 19:11:43 +02:00
kaetemi
8a80c21661 Changed: Reserve sheet id with short id 0 for unknown sheet for new sheet types 2012-06-05 15:13:13 +02:00
kaetemi
6a806d82d2 Changed: Small optimization for sheet id constructor with default type 2012-06-05 14:03:38 +02:00
SirCotare
6d33124bc3 #1470 monday's push_all
--HG--
branch : gsoc2012-achievements
2012-06-04 21:23:14 +02:00
kaetemi
c618a29276 Reverted: Unnecessary changes to config and data from merge 2012-06-04 15:03:40 +02:00
kaetemi
5b22c91c93 Merged: From sound_dev to default (Summary: Sound CSheetId implementation, improved manual rolloff function performance) 2012-06-04 14:53:50 +02:00
kaetemi
a57881561b Fixed: Bad serialization of sound name in background sounds
--HG--
branch : sound_dev
2012-06-04 13:28:03 +02:00
kaetemi
fc8e83a0b9 Changed: Assign sane type id to temporary sound sheet ids
--HG--
branch : sound_dev
2012-06-04 13:27:12 +02:00
kaetemi
36eb2a3057 Changed: Tool build_soundbank can also work without sheet id bin
--HG--
branch : sound_dev
2012-06-04 12:37:56 +02:00
kaetemi
d3352cecf6 Changed: Removed some debug messages
--HG--
branch : sound_dev
2012-06-04 12:35:34 +02:00
SirCotare
41ce43d4b9 #1470 initial achievement tracker
--HG--
branch : gsoc2012-achievements
2012-06-04 00:34:26 +02:00
SirCotare
a71989e70f #1470 minor bugfixes with app rendering; added Tieable interface
--HG--
branch : gsoc2012-achievements
2012-06-03 23:03:33 +02:00
SirCotare
39e57873be #1470 bugfix in tie logics while rendering
--HG--
branch : gsoc2012-achievements
2012-06-03 20:53:01 +02:00
kaetemi
8a696b55e1 Fixed: Make build_soundbank tool work with latest changes
--HG--
branch : sound_dev
2012-06-03 16:00:43 +02:00
kaetemi
497ae4d09b Added: Temporary workaround for using sound sheet id without updated sheet id bin
--HG--
branch : sound_dev
2012-06-03 15:57:57 +02:00
kaetemi
6bc3ef2ba6 Changed: Also handle distMax with negative alpha in new manual rolloff function
--HG--
branch : sound_dev
2012-06-03 15:56:47 +02:00
SirCotare
f18e2a7a76 #1470 tied achievements added
--HG--
branch : gsoc2012-achievements
2012-06-03 15:04:04 +02:00
kaetemi
2fc601c556 Changed: Avoid some more sqrt calculations
--HG--
branch : sound_dev
2012-06-03 02:00:32 +02:00
kaetemi
19d2d91f86 Added: Specific code for amplitude based rolloff to avoid unneccesary log10 and pow calls and improve performance
--HG--
branch : sound_dev
2012-06-03 01:50:53 +02:00
kaetemi
221d04642a Changed: Debug messages
--HG--
branch : sound_dev
2012-06-02 23:06:48 +02:00
kaetemi
fc4d91fad2 Fixed: Sound CSheetId implementation
--HG--
branch : sound_dev
2012-06-02 18:12:38 +02:00
kaetemi
f79f3fca48 Fixed: Sound CSheetID implementation (part 3) (partially tested)
--HG--
branch : sound_dev
2012-06-02 16:06:10 +02:00
kaetemi
9cd7498fe9 Fixed: Sound CSheetID implementation (part 2) (not tested)
--HG--
branch : sound_dev
2012-06-02 15:24:21 +02:00
kaetemi
3608f0a429 Added: Additional constructor for CSheetId with default type, in case the user did not put the type with the sheet name
--HG--
branch : sound_dev
2012-06-02 15:21:03 +02:00
kaetemi
aa7598efe2 Fixed: Sound CSheetId implementation (part 1) (not tested)
--HG--
branch : sound_dev
2012-06-02 14:54:39 +02:00
kaetemi
35503d03e5 Added: Missing implementation of initWithoutSheet to use CSheetId without a sheet_id.bin, required for leveldesign and build tools
--HG--
branch : sound_dev
2012-06-02 14:53:11 +02:00
kaetemi
cab401fa13 Merged: From default to sound_dev
--HG--
branch : sound_dev
2012-06-02 11:09:14 +02:00
kaetemi
df5c53a6cf Merged: From gsoc2012-fabien r2211 to sound_dev
--HG--
branch : sound_dev
2012-06-02 10:57:01 +02:00
SirCotare
29d1d9372f #1470 class files moved; some rendering improvements;
--HG--
branch : gsoc2012-achievements
2012-05-31 15:15:36 +02:00
sfb
af454dd1cf Fixed EOL issues and added .hgeol file. 2012-05-29 08:31:11 -05:00
SirCotare
c4962725a3 #1470 Achievement summary added; improved menu handling; Class scheme (UML) added;
--HG--
branch : gsoc2012-achievements
2012-05-28 21:09:44 +02:00
SirCotare
454055ad7e #1470 working frontend + demo data; ingame rendering not included
--HG--
branch : gsoc2012-achievements
2012-05-27 21:08:28 +02:00
Fabien_HENON
a55297c29a Changed: #1469 StringId conversion to CSheetId for sounds
--HG--
branch : gsoc2012-fabien
2012-05-26 23:40:27 +02:00
Fabien_HENON
dd6f2f2611 Changed: #1469 Getting last version from default branch
--HG--
branch : gsoc2012-fabien
2012-05-26 21:38:30 +02:00
Fabien_HENON
f70bdc4032 Changed: #1469 StringId conversion to SheetId for sounds V2 (DOES NOT COMPILE YET)
--HG--
branch : gsoc2012-fabien
2012-05-26 19:21:19 +02:00
SirCotare
36f39152e5 #1470 bugfix in webig renderer (bgcolor); ER scheme/SQL update; untested wip of achievement app
--HG--
branch : gsoc2012-achievements
2012-05-25 11:48:56 +02:00
kervala
e9692f5fea Fixed: Compilation under Mac OS X without -DWITH_STATIC_DRIVERS=ON 2012-05-24 20:28:19 +02:00
rti
b09cd066d7 merge 2012-05-24 16:35:28 +02:00
rti
63191bb27d Fixed: Build on Mac OS X, "id" is a datatype in objective-c(++) 2012-05-24 16:33:56 +02:00
kervala
fa63a284c2 Fixed: #1474 Compilation with new MySQL headers 2012-05-24 12:56:53 +02:00
Fabien_HENON
5174e15521 Changed: #1469 StringId conversion to SheetId for sound (DOES NOT COMPILE YET)
--HG--
branch : gsoc2012-fabien
2012-05-23 22:27:39 +02:00
kaetemi
fade75eba6 Added: Hack to exclude .sound sheets starting with _ from being filtered out from the sheet_id.bin. Sound sheets do not follow the conventional sheets naming pattern at the moment 2012-05-23 22:05:34 +02:00
kervala
d27c9cfc69 Fixed: Compilation with new MySQL headers 2012-05-21 10:51:30 +02:00
kervala
f6178de16c Changed: Don't include local files in PCH 2012-05-21 10:04:00 +02:00
kervala
b0c27a92ce Fixed: Some Windows.h inclusions 2012-05-21 10:03:08 +02:00
kervala
78bc0fb0d7 Fixed: Compilation with new mysqlclient headers 2012-05-20 00:05:01 +02:00
kervala
4be2469c8b Fixed: Compilation under Windows 2012-05-19 23:47:43 +02:00
kervala
96372fb098 Changed: #878 Fix typos in comments/code 2012-05-19 23:43:42 +02:00
kervala
09a163d76e Fixed: Revision 0 bug 2012-05-19 23:25:06 +02:00
kervala
dc8b368cfc Changed: Fix PCH for some cases under Mac OS X 2012-05-19 23:24:44 +02:00
kervala
7cc130f42a Changed: Revert a previous "fix" because iconv is already linked to Ryzom client under Mac OS X 2012-05-19 14:49:38 +02:00
kervala
0ca7e4d64d Fixed: Compilation under Mac OS X where curl needs iconv 2012-05-19 09:09:41 +02:00
kervala
d2de5596f5 Fixed: Compilation under Linux 2012-05-18 21:08:21 +02:00
kervala
b0e48907d7 Fixed: #1328 Map time and weather Issue (synced with SVN, thanks!) 2012-05-18 20:53:59 +02:00
SirCotare
14d5257929 #1470 still learning hg... ER scheme update
--HG--
branch : gsoc2012-achievements
2012-05-17 01:53:10 +02:00
SirCotare
28d24a4cb3 #1470 DB ready for initial webig implementation
--HG--
branch : gsoc2012-achievements
2012-05-17 01:48:51 +02:00
SirCotare
328e062e74 #1470 ER updated; SQL dump added
--HG--
branch : gsoc2012-achievements
2012-05-17 01:04:39 +02:00
SirCotare
b220a2a091 #1470 Database ER scheme (wip)
--HG--
branch : gsoc2012-achievements
2012-05-17 00:01:28 +02:00
sfb
4ed75f94f4 Changed: Changed the README to have the AGPL version in it 2012-05-16 13:34:49 -05:00
sfb
a1e65ad691 merge incoming 2012-05-15 13:52:33 -05:00
sfb
a8a455fddd Changed: #1306 Added basic new form creation. Lots of bugs still. 2012-05-15 13:51:48 -05:00
kervala
097138eaba Changed: #1275 Compilation under Mac OS X 2012-05-15 12:58:20 +02:00
kervala
2e08d335ab Changed: #825 Remove all warnings when compiling Ryzom 2012-05-15 12:55:56 +02:00
SirCotare@Medivh
48775aa07c #1470 initial test :)
--HG--
branch : gsoc2012-achievements
2012-05-14 20:24:58 +02:00
kervala
30f83a5097 Changed: #878 Fix typos in comments/code 2012-05-14 13:32:06 +02:00
kervala
d9f32be674 Fixed: Crash when suri is empty 2012-05-14 13:30:41 +02:00
kervala
d4372f4aa1 Changed: #1275 Use of NLDRIVERGL or NLDRIVERGLES namespaces with NL_STATIC to avoid duplicated symbols 2012-05-14 13:21:00 +02:00
kervala
52524f27fb Changed: #878 Fix typos in comments/code 2012-05-14 13:08:44 +02:00
kervala
06df6c64b7 Changed: #825 Remove all warnings when compiling Ryzom 2012-05-14 13:06:37 +02:00
kervala
db208efe92 Changed: #1275 Create an OpenGL ES driver 2012-05-13 17:43:46 +02:00
kervala
2c27caef09 Changed: #1275 Enable OpenGL ES driver in Ryzom client 2012-05-13 17:14:34 +02:00
kervala
318ae1e66c Changed: Search CppTest headers in cpptest subfolder too 2012-05-13 16:24:34 +02:00
kervala
9061d9a9b6 Changed: Search MySQL headers in mysql subfolder too 2012-05-13 16:24:14 +02:00
kervala
f7888cb7c9 Changed: #1275 Added OpenGL ES CMake module 2012-05-13 16:23:48 +02:00
kervala
5f04213d44 Changed: #1275 Create an OpenGL ES driver 2012-05-13 15:27:20 +02:00
kervala
dbd45081f4 Changed: Include OpenGL headers in "opengl" directory 2012-05-13 15:26:45 +02:00
kervala
7a23895df3 Changed: Update glext.h 2012-05-12 20:58:23 +02:00
kervala
26dd470afc Changed: #1275 Create an OpenGL ES driver 2012-05-12 20:56:37 +02:00
kervala
07dd298ed2 Changed: Include stdopengl.h in Objective-C files 2012-05-12 20:55:58 +02:00
kervala
f6c77399a9 Fixed: Renable PCH under for OpenGL driver under Mac OS X 2012-05-12 20:54:37 +02:00
kervala
cf5e9bc8d9 Changed: #1275 Create an OpenGL ES driver 2012-05-12 19:21:52 +02:00
sfb
1fdaa8155b Fixed: #1374 Rolled back a const-ness change and tested connecting to Ring successfully. 2012-05-10 08:06:19 -05:00
kervala
36b4d1a298 Added: Xcode checks and specific flags
Changed: Target by default Mac OS X 10.6 if not specified
Changed: Add -isysroot, -arch and -mmacosx-version-min flags if needed
2012-05-08 00:07:14 +02:00
kervala
e17fb8e2de Added: Mac OS X resources 2012-05-07 10:30:37 +02:00
kervala
421c6482d9 Changed: Set CMAKE_OSX_DEPLOYMENT_TARGET if not defined
Changed: Use custom Info.plist
Added: RYZOM_DATA_DIR option to copy data from there
2012-05-07 10:30:24 +02:00
kervala
15d2226427 Changed: Use only static libraries under Mac OS X if WITH_STATIC_EXTERNAL is used
Changed: Strip binaries under Mac OS X by default in Release (use WITH_SYMBOLS if you don't want)
2012-05-07 10:27:54 +02:00
kervala
aa9d2bfe8b Fixed: Compilation using WITH_STATIC_EXTERNAL under Mac OS X 2012-05-06 21:50:44 +02:00
vl
a89fe5182e Added: external auth 2012-05-04 18:33:59 +02:00
sfb
0e8ef814c3 Fixed: #1465 Added debugging flag to NL_DEBUG_CFLAGS. 2012-05-04 08:58:52 -05:00
vl
f333236a6b Merge 2012-05-04 12:08:04 +02:00
vl
b95a53d728 Added: new webig system 2012-05-04 12:04:49 +02:00
sfb
fbc6e6f5fe Changed: #1306 Implemented basic form saving. 2012-05-03 08:02:14 -05:00
kaetemi
ad3a424d56 Fixed: Compile error 2012-04-30 09:38:27 +02:00
sfb
c0bbb9135e merge 2012-04-26 13:07:43 -05:00
sfb
e6df7a7703 Changed: #1306 Implemented add/removing parent sheets, moved everything out of Plugin and into GeorgesQt namespace to eliminate ambiguity with other plugins. 2012-04-26 13:05:53 -05:00
dnk-88
4bed6e3261 Changed: #1306 Improved ui of geqt 2012-04-23 20:30:57 +03:00
sfb
cd6dfef39d Changed: #1306 Added undo stack deeper (for later) and began adding form context menus proof-of-concept. 2012-04-20 15:40:02 -05:00
sfb
70ec74a97f Changed: #1306 Implemented core "open" action to load a form from an arbitrary location. 2012-04-20 12:46:18 -05:00
sfb
a5de55c18d merge 2012-04-18 11:08:44 -05:00
sfb
c2e63b9d9d Changed: Used a Regex to workaround the colon project name issue for VS10. 2012-04-18 11:07:01 -05:00
kaetemi
b3260314ac Fixed: Crash on exit caused by incomplete music channel reset 2012-04-13 23:30:35 +02:00
kaetemi
e611666391 Fixed: Warnings 2012-04-13 23:29:18 +02:00
kaetemi
adfffad551 Fixed: Typo 2012-04-13 14:15:04 +02:00
kaetemi
f17f7e726d Changed: #1459 Reserve functional group controller node names 2012-04-13 13:59:24 +02:00
kaetemi
def7d31721 Merge 2012-04-13 11:59:56 +02:00
kaetemi
cdb719130f Changed: #1459 Simplify the sound group controller interface 2012-04-13 11:54:20 +02:00
kervala
e3170b57bc Changed: #825 Remove all warnings when compiling Ryzom 2012-04-13 10:07:06 +02:00
kervala
1b6c957c81 Changed: #825 Remove all warnings when compiling Ryzom 2012-04-13 09:36:51 +02:00
kaetemi
de4e298fb6 Changed: Provide a fake sound name for fake CSound created by music channel 2012-04-13 03:10:13 +02:00
kaetemi
ac948b8a53 Changed: #1461 Bad minimum value for comparing fast swim speed causes random switching between fast and slow swim speed particle effects 2012-04-13 03:06:52 +02:00
kaetemi
b13f0dcb34 Fixed: #1298 Replace assert with warning when physical sound source fails to play 2012-04-12 21:38:28 +02:00
kaetemi
b68d8ca2aa Merged: From default to sound_dev
--HG--
branch : sound_dev
2012-04-12 18:21:26 +02:00
kaetemi
4a02d20a4c Fixed: The default max distance for sources is now sqrt(numeric_limits<float>::max())
--HG--
branch : sound_dev
2012-04-12 18:16:53 +02:00
kaetemi
b371588b93 Added: Log warnings when setting excessively high max distances on sound sources
--HG--
branch : sound_dev
2012-04-12 18:06:33 +02:00
kaetemi
f9745080b5 Removed: Warning messages
--HG--
branch : sound_dev
2012-04-12 17:56:54 +02:00
kaetemi
d63bda28f4 Fixed: Relative positioning mode was not implemented in OpenAL library driver with manual rolloff enabled
--HG--
branch : sound_dev
2012-04-12 17:48:56 +02:00
kaetemi
b6025fc008 Fixed: Always commit 3d positioning when calling play on sources. This avoids having to wait for update call. Sources no longer cause loud noise when ryzom client finishes loading
--HG--
branch : sound_dev
2012-04-12 17:24:06 +02:00
kervala
8e70469541 Changed: Define Release configuration for compilation checks and as default if not defined (must be defined before PROJECT) 2012-04-12 16:01:38 +02:00
kaetemi
015f47d71d Changed: #795 Handle safely when audio decoder fails to be created
--HG--
branch : sound_dev
2012-04-12 12:06:03 +02:00
kaetemi
a33f3e7e32 Merge
--HG--
branch : sound_dev
2012-04-12 00:28:10 +02:00
kaetemi
1b41357a43 Fixed: #795 #1460 Linux compile of new sound samples
--HG--
branch : sound_dev
2012-04-12 00:27:03 +02:00
kaetemi
1cd4936ceb Changed: #795 #1460 Make sure the streaming thread safely stops in all cases
--HG--
branch : sound_dev
2012-04-12 00:25:26 +02:00
kervala
eeecc06601 Changed: #1448 Compilation with Clang 2012-04-11 23:59:55 +02:00
kervala
d0314c9e0e Fixed: Servers compilation if using static mysql library compiled with OpenSSL 2012-04-11 23:43:11 +02:00
kaetemi
b486e22a96 Fixed: Typos and warnings
--HG--
branch : sound_dev
2012-04-11 23:34:36 +02:00
kaetemi
80bf70efbb Changed: Make CWinThread::start more sane, and fixed a typo
--HG--
branch : sound_dev
2012-04-11 22:05:18 +02:00
kaetemi
c0c5ee6d93 Fixed: Implementation for CPThread::isRunning()
--HG--
branch : sound_dev
2012-04-11 21:55:33 +02:00
kaetemi
1b49b59e02 Fixed: #795 Hang when stopping file stream source that is synchronously waiting for play
--HG--
branch : sound_dev
2012-04-11 21:51:01 +02:00
kaetemi
41968b0674 Fixed: Compile error
--HG--
branch : sound_dev
2012-04-11 21:49:25 +02:00
kaetemi
c03655b0ba Added: Some sort of implementation for CPThread::isRunning()
--HG--
branch : sound_dev
2012-04-11 20:20:02 +02:00
kaetemi
695dac7783 Added: #1460 Music channel on top of stream file source when driver does not have built-in music channels
--HG--
branch : sound_dev
2012-04-11 19:30:37 +02:00
kaetemi
2f504788f0 Added: #795 Synchronous loading of audio file streams
--HG--
branch : sound_dev
2012-04-11 18:07:16 +02:00
kaetemi
3bbf48e699 Added: #795 Sample for creating a sound source using .sound sheet with .ogg file
--HG--
branch : sound_dev
2012-04-11 17:44:57 +02:00