Commit Graph

456 Commits

Author SHA1 Message Date
xawotihs d6c7dc22df Fixed abs in corewrapper on Android 2013-11-26 23:19:36 +01:00
xawotihs 94deb63d22 Fixed corewrapper Android files. 2013-11-26 23:03:30 +01:00
xawotihs 294c396417 Fixed compilation issues 2013-11-26 06:07:23 +01:00
xawotihs ac54bf32d3 Merge branch 'master' into wp8 2013-11-26 05:09:34 +01:00
Tobias Loose 352e3c2daa Remove makros and add undefs to avoid clashing names
FRAND and Clamp were not used and Clamp collided when doing unit builds.
SQUARE(x) is longer than x*x and if x is an expression it gets evaluated
twice.
2013-11-23 16:03:04 +01:00
xawotihs ca3084221c Merged Master branch into wp8 2013-11-22 17:21:25 +01:00
Dmitry Panin 071a487100 Fixed compilation error 2013-11-19 11:06:31 +04:00
Dmitry Panin f370899a8a Thread-safe version of OutputCapturer 2013-11-19 03:58:43 +04:00
Dmitry Panin 331e126787 Added info about total number of tests 2013-11-19 02:57:42 +04:00
Dmitry Panin 6c41e5c92c Added option (#define CAPTURE_STDERR)
if set then the DebugTrace calls only for failing tests are shown
2013-11-19 02:41:30 +04:00
xawotihs 5d453c6716 Fixes compilation on Linux. 2013-11-17 20:22:30 +01:00
xawotihs b177a5ff22 Fixes Renderer creator. 2013-11-17 19:27:27 +01:00
xawotihs 958440d909 More PSP compilation fixes 2013-11-17 19:07:22 +01:00
xawotihs 422bb430d4 More compilation fixes for PSP 2013-11-17 18:55:52 +01:00
xawotihs d052ae1667 Tries to fix the PSP build 2013-11-17 18:47:06 +01:00
xawotihs 2c2edad8e5 Merge branch 'master' of https://github.com/WagicProject/wagic into wp8
Fixe timer in Qt frontend
Fixe ExtraCost compilation (uses boost when not on WP8).
2013-11-17 18:33:52 +01:00
xawotihs a6ba983650 Added WRL frontend for Win8 and WP8
Merged Qt, SDL and WRL frontend on the same corewrapper
Moved OpenGL code out of SDL and Qt frontends to OpenGl backend
(JGfx.cpp)
Updated file system and network code to be compatible with WRL
2013-11-17 16:46:44 +01:00
xawotihs 9f16b2208d Removes the error, it was perfectly detected by Travis CI. 2013-11-09 20:15:00 +01:00
xawotihs 0a765b702b Introducing an error to check if Travis reports correctly a compile
error with the script.
2013-11-09 20:01:57 +01:00
xawotihs 90652fa73d Fixed PSP build and integrates it with Travis CI 2013-11-09 19:40:01 +01:00
xawotihs 9ac28d35a2 Adds missing zlib header, VS project files for JPEG and PNG libs 2013-11-09 01:25:03 +01:00
xawotihs 45a3d4b835 Adds the zlib sources for wp8 support 2013-11-09 01:20:39 +01:00
xawotihs fea5b04a77 Fixed compilation on Windows. 2013-10-31 23:48:19 +01:00
xawotihs 017f6dd1ed Deactivated part of the traces outputted by the testsuite to make Travis
happy.
2013-10-30 22:58:04 +01:00
xawotihs dac31994b6 Adding traces for important directories. 2013-10-30 21:44:23 +01:00
xawotihs f08f0ad3b9 Merge branch 'master' of https://github.com/WagicProject/wagic
Conflicts:
	JGE/include/JTypes.h
2013-10-29 23:36:07 +01:00
xawotihs a3a1bc2b79 Created a dedicate console Qt based wagic application and run it in the
travis file.
2013-10-29 22:38:37 +01:00
Michael Nguyen b17d9d3f85 Merge branch 'master' of github.com:WagicProject/wagic 2013-10-28 15:35:45 -07:00
Michael Nguyen 84ca7457b5 updaed for iOS6 2013-10-28 15:20:35 -07:00
Unknown 224c94e890 Included some testsuite into qtmain and updated travis file to try to use it. 2013-10-27 23:06:29 +01:00
Xawotihs@gmail.com 26ab65860e Fixed a gazillion of warnings occuring when compiling Wagic with Clang with Werror. 2013-06-09 21:16:39 +00:00
rolzad73@gmail.com 7990540096 fixed music resource adding from resource zip to nested folder on Android platorm. Fixed issue 776 2013-06-03 02:15:12 +00:00
wagic.the.homebrew@gmail.com 9fa9e1eb81 undo my changes with libhgetools.a, it seems something's wrong on my end, as my computer interprets u32 as unsigned long instead of unsigned int 2013-05-08 12:37:16 +00:00
wagic.the.homebrew@gmail.com aa51083b2b update hge compiled lib 2013-05-06 06:01:19 +00:00
Xawotihs@gmail.com 2c0e0c7251 Removed the link between the font textures resolution and the size of the characters displayed. That allows to use very high resolution fonts similarly to card pictures... 2013-03-23 17:21:17 +00:00
Xawotihs@gmail.com 5a9b7eefc0 Fixed PSP compilation by stubbing the socket implementation. Somebody with a PSP, please replace this code with a real implementation. 2013-02-03 21:41:31 +00:00
Xawotihs@gmail.com 5c25189aef Added code to let user specify the server address.
Updated SimplePad to include dot and fixed problem with digits.
2013-02-03 19:21:43 +00:00
Xawotihs@gmail.com 12620e5d22 Just tested network game Linux desktop vs Android tablet ... works fine :) 2013-01-29 21:05:24 +00:00
Xawotihs@gmail.com 48d45f2a65 Added missing .h and fixed the boost sleep, it works fine on linux now. 2013-01-28 22:26:13 +00:00
Xawotihs@gmail.com faff7724d6 Added a function to get the current IP address 2013-01-28 22:03:26 +00:00
wagic.the.homebrew@gmail.com 5fa1cc915b A "fix" for Android compilation. Feel free to replace if something better is available 2013-01-27 09:36:43 +00:00
Xawotihs@gmail.com 975445d3d5 #ifdef out on Windows a fix for Linux 2013-01-26 22:35:57 +00:00
Xawotihs@gmail.com eec9bb44a8 Fixed warnings from linux and Android compilers
Cleaned up network code on Linux, it still does not work correctly
2013-01-26 22:17:43 +00:00
Xawotihs@gmail.com 2ba5eb0022 Cleaned up Network code (hope that fixes the PSP compilation problems)
Added random seed logging
2013-01-25 21:47:16 +00:00
Xawotihs@gmail.com 9db8478dfe Created a NetworkGameObserver class able to extend the serialization code of GameObserver to synchronize and forward game actions on the network
Fixes in GameObserver serialization/deserialization code
Fixes in JNetwork and JSocket on windows
Various code cleanup (currentGamePhase access in particular)
Updated GUI code to re-enable a basic network GUI
Activated threaded tests on Windows. It uses 4 threads by default.
2013-01-22 22:39:49 +00:00
Xawotihs@gmail.com 123a6aa21f Fixed remote hash retrieval 2012-12-26 18:14:27 +00:00
wagic.the.homebrew@gmail.com 7583e61510 remove non ascii characters from ZipFS 2012-08-26 06:07:48 +00:00
Xawotihs@gmail.com a8492b7c5a Fixed compilation with mingwin 2012-06-01 23:36:18 +00:00
techdragon.nguyen@gmail.com aea30129dd fixed iOS ad sizing 2012-04-15 14:17:45 +00:00
Xawotihs@gmail.com 2acdf55548 Fixed compilation on Windows with gcc 2012-04-15 11:51:18 +00:00