85f4a4c36a
Started to merge @ZobyTwo cmake branch
2015-09-26 21:52:07 +02:00
5ae9d42480
Fixed compilation issue with clang
2015-09-25 20:21:10 +02:00
b8b5362ba5
Removed dependency on boost when Qt is used.
2015-09-24 23:20:52 +02:00
907274f9bd
Fixed cross-compiling with theos
2015-08-23 21:23:55 +02:00
d656730d3a
Fixed phonon support
2014-11-23 16:24:36 +01:00
d7628b3eb2
Fixed console with Qtmultimedia
2014-08-03 12:20:45 +02:00
8b22d032cd
Fixed QT version needed for pixelRatio API
2014-08-02 21:05:55 +02:00
ac5c14b977
Fixed QtMultimedia port, replaced QSoundEffect by QMediaPlayer as all codecs were not supported by first class.
2014-08-02 17:12:19 +02:00
5d7667dc01
Cleaned Phonon vs QtMultimedia config
2014-01-31 21:53:27 +01:00
18383579e9
Fixed android compilation
2014-01-27 06:31:23 +01:00
03d4f8ffa1
Added Qt Multimedia support in order to replace Phonon. Currently does not work on Mac.
2014-01-26 23:56:15 +01:00
1d33de59a9
Fixed compilation issue
2014-01-12 22:56:53 +01:00
0c4b09891b
Removed hardcoded testing values and used 32 bits file size instead of 64 bits.
2014-01-12 22:40:45 +01:00
25955303e7
Adds a Downloader component to JGE able to download and cache files.
2014-01-12 22:16:35 +01:00
da31371d86
Include c++11 threading
2013-12-20 18:39:02 +01:00
caec886e22
Fixed issues found by XCode.
2013-12-20 00:24:08 +01:00
95805ea387
Fixed QT mingw cross compile with QT4.8
2013-12-15 00:26:04 +01:00
4765890d0a
Fixed mouse input with retina display
2013-12-14 23:46:23 +01:00
cb73e2b90d
Merge branch 'master' into ci_upload_binaries
...
Fixed Windows compilation.
2013-12-07 22:08:54 +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
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
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
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
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
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
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
48d45f2a65
Added missing .h and fixed the boost sleep, it works fine on linux now.
2013-01-28 22:26:13 +00:00
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
2ba5eb0022
Cleaned up Network code (hope that fixes the PSP compilation problems)
...
Added random seed logging
2013-01-25 21:47:16 +00:00
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
a8492b7c5a
Fixed compilation with mingwin
2012-06-01 23:36:18 +00:00
6124280f24
added a prefernces screen to handle media card selection on Android devices. Contains actual fix for 4297.
...
Added a place marker to allow volume change during app. Right now it's either loud or off. There isn't a way to allow the volume to gradually go up and odwn based on the values set in settings.
2012-03-01 03:24:34 +00:00
5c293e2fbb
added new method to JSoundSystem to pause music. Previously, "pause" meant kill the music and "resume" effectively restarted the music. iOS will now pause and resume appropriately
...
modified pc and android impls to ensure new calls are made. These still have the same effective outcome (kill and start) until the equivalent is coded on these platforms to pause and resume the music.
fixed bug with iOS sound effects not playing. Forgot to assign the key to the associated music sample
2012-02-05 08:21:06 +00:00
78c08af9f5
first run through for sound on iOS platforms. Currently works only for simulator unless the music files are extracted from the zip file onto the filesystem.
2012-02-03 11:23:27 +00:00
4762ffea87
- Fixed compilation warning in GameStateShop.cpp
...
- Added a call to input reset after each update in the Qt frontends to avoid strange auto-keypress
- Removed tutorial display in AI vs AI (test AI mode)
- Commit Qt project with latest buttons files
- Added a small isHuman method to the Player class
2012-01-30 21:16:33 +00:00
28be95b401
Updated Qt frontend to latest Scroll interface
2012-01-29 22:34:55 +00:00
9faf2ffc72
reverted changes to the Scroll/OnScroll method signatures.
2012-01-27 23:47:02 +00:00
b9a52ab447
Fixed compilation of the Qt frontend with latest scroll changes
...
fixed Qt project compilation with Mingw on Windows
2012-01-26 23:17:40 +00:00
a438c9135e
vs 2010 update for deck editor changes as well as SDL update
2012-01-26 14:54:17 +00:00
a2179017d4
Extended Scroll() and OnScroll() to also take in magnitude as one of its parameters. magnitude is currently used in the deck editor to figure out how many cards to rotate around per swipe as function of velocity and the number of cards displayed on the screen.
...
fixed a compiler warning in SimplePopup in the constructor declaration
===DECK Editor changes ===
Added two touch buttons , one for "Sell Card", the other to switch between Deck and Collection.
changed swipe Left/Right to rotate card collection; removing the previous action which was to swap between deck/collection viewing
Note: GameStateDeckViewer isn't a JGuiController so can't leverage off the mButtons vector. Thus, the buttons have to be handled by this class separately. (setButtonState, userPressedButton)
2012-01-26 13:53:03 +00:00
xawotihs
Tobias Loose
Dmitry Panin
xawotihs
Michael Nguyen
Unknown
Xawotihs@gmail.com
techdragon.nguyen@gmail.com