28ec24430d
Fixed SDL build with mingw. In particular, replaced boost dependency by c++11.
2013-12-08 22:30:25 +01:00
3af4546ef7
Merge branch 'master' into wp8
2013-12-08 14:17:42 +01:00
cb73e2b90d
Merge branch 'master' into ci_upload_binaries
...
Fixed Windows compilation.
2013-12-07 22:08:54 +01:00
ee217e94a8
Fixed carousel pull request with Visual Studio.
2013-12-07 20:29:42 +01:00
38e19f7d35
Removed mingw32-qt
...
Merged SDL and QT .pro files
Removed glu dependency in corewrapper and JGfx to enable mingw cross compilation.
2013-12-07 18:57:57 +01:00
2289fffb8d
Do not ftbfs when in release mode (-weror, -wunused-.. combination)
2013-12-05 23:06:30 +01:00
657479e0e4
Do not specify the system directory in JGE
2013-12-04 11:58:36 +01:00
f550784973
Merge branch 'master' into wp8
...
Conflicts:
JGE/src/Qtmain.cpp
2013-11-29 22:31:20 +01:00
bedd1e8da8
Merge branch 'valgrind' of https://github.com/ZobyTwo/wagic into ZobyTwo-valgrind
2013-11-29 19:41:46 +01:00
965d4f6d45
Fixes Windows project
2013-11-29 19:31:23 +01:00
0db2925e7a
Fix initialization orders
2013-11-29 18:44:30 +01:00
031f2dbffb
Fix Valgrind warnings appearing during the test suit.
2013-11-29 18:21:53 +01:00
dbece750f8
Use tabs instead of spaces if the file uses tabs
2013-11-29 13:51:13 +01:00
9d5a83d588
Replace more strcmp with std::string::compare or std::string::operator==.
...
This commit also enables TinyXML STL support.
2013-11-28 16:42:29 +01:00
d6c7dc22df
Fixed abs in corewrapper on Android
2013-11-26 23:19:36 +01:00
94deb63d22
Fixed corewrapper Android files.
2013-11-26 23:03:30 +01:00
294c396417
Fixed compilation issues
2013-11-26 06:07:23 +01:00
ac54bf32d3
Merge branch 'master' into wp8
2013-11-26 05:09:34 +01:00
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
ca3084221c
Merged Master branch into wp8
2013-11-22 17:21:25 +01:00
071a487100
Fixed compilation error
2013-11-19 11:06:31 +04:00
f370899a8a
Thread-safe version of OutputCapturer
2013-11-19 03:58:43 +04:00
331e126787
Added info about total number of tests
2013-11-19 02:57:42 +04:00
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
5d453c6716
Fixes compilation on Linux.
2013-11-17 20:22:30 +01:00
b177a5ff22
Fixes Renderer creator.
2013-11-17 19:27:27 +01:00
958440d909
More PSP compilation fixes
2013-11-17 19:07:22 +01:00
422bb430d4
More compilation fixes for PSP
2013-11-17 18:55:52 +01:00
d052ae1667
Tries to fix the PSP build
2013-11-17 18:47:06 +01:00
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
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
9f16b2208d
Removes the error, it was perfectly detected by Travis CI.
2013-11-09 20:15:00 +01:00
0a765b702b
Introducing an error to check if Travis reports correctly a compile
...
error with the script.
2013-11-09 20:01:57 +01:00
90652fa73d
Fixed PSP build and integrates it with Travis CI
2013-11-09 19:40:01 +01:00
9ac28d35a2
Adds missing zlib header, VS project files for JPEG and PNG libs
2013-11-09 01:25:03 +01:00
45a3d4b835
Adds the zlib sources for wp8 support
2013-11-09 01:20:39 +01:00
fea5b04a77
Fixed compilation on Windows.
2013-10-31 23:48:19 +01:00
017f6dd1ed
Deactivated part of the traces outputted by the testsuite to make Travis
...
happy.
2013-10-30 22:58:04 +01:00
dac31994b6
Adding traces for important directories.
2013-10-30 21:44:23 +01:00
f08f0ad3b9
Merge branch 'master' of https://github.com/WagicProject/wagic
...
Conflicts:
JGE/include/JTypes.h
2013-10-29 23:36:07 +01:00
a3a1bc2b79
Created a dedicate console Qt based wagic application and run it in the
...
travis file.
2013-10-29 22:38:37 +01:00
b17d9d3f85
Merge branch 'master' of github.com:WagicProject/wagic
2013-10-28 15:35:45 -07:00
84ca7457b5
updaed for iOS6
2013-10-28 15:20:35 -07:00
224c94e890
Included some testsuite into qtmain and updated travis file to try to use it.
2013-10-27 23:06:29 +01:00
26ab65860e
Fixed a gazillion of warnings occuring when compiling Wagic with Clang with Werror.
2013-06-09 21:16:39 +00:00
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
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
aa51083b2b
update hge compiled lib
2013-05-06 06:01:19 +00:00
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
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
Tobias Loose
Dmitry Panin
xawotihs
Michael Nguyen
Unknown
Xawotihs@gmail.com
rolzad73@gmail.com
wagic.the.homebrew@gmail.com