Commit Graph

429 Commits

Author SHA1 Message Date
Michael Nguyen
ed474d6b5d Merge commit '224c94e89089317fac33aacb9319ab250301c98e' into develop 2013-10-28 15:37:24 -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
techdragon.nguyen@gmail.com
405df8bd15 refactored gesture recognition for iOS 2012-04-12 11:53:42 +00:00
techdragon.nguyen@gmail.com
218db9d844 improved scrolling of simple menus. Now you can scroll up as well as down by activating the area above/below the menu items
removed the buttons when displaying the filter menus.
2012-03-23 13:17:13 +00:00
techdragon.nguyen@gmail.com
57627849a0 modified font size of text in menus.
Adjusted the spacing between menu items on all menus. They were a little too far apart once I modified the font size.
fixed Hollowhenge Spirit
2012-03-20 08:35:38 +00:00
techdragon.nguyen@gmail.com
7482fa811c reverted default card path to /mnt/sdcard/Wagic 2012-03-01 03:41:51 +00:00
techdragon.nguyen@gmail.com
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
techdragon.nguyen@gmail.com
0b6756164a fixed bug in booster display where swiping right or pressing JGE_BTN_PRI (Square) would bring up a new set of cards to buy from. 2012-02-28 14:17:19 +00:00
techdragon.nguyen@gmail.com
42cdd27e0b fixed music bug for Momir and Random game types. The functions that determined if a file existed did not handle errors properly. Instead it would return an empty string which when appended to the base path would always return true. Thus a non-existent file would always be treated as if it existed. The guards I put in test for empty strings before continuing evaluation. I may have been a little judicious in the places where I put the gaurds in. We can remove the guards if it turns out we don't need them in all the places. 2012-02-23 02:11:14 +00:00
techdragon.nguyen@gmail.com
c55632a19b allowed for overwriting of existing zip files. The existing file needs to be removed before copying new file to existing location. Otherwise an exception is flagged and nothing is done. 2012-02-22 08:37:43 +00:00
techdragon.nguyen@gmail.com
cecf5f8060 fixed Android issues with new onscreen buttons.
fixed some stability issue with the deck viewer.
2012-02-21 12:53:11 +00:00
techdragon.nguyen@gmail.com
2e65fe02fe fixed some memory leaks found in the analyzer 2012-02-16 06:49:31 +00:00
techdragon.nguyen@gmail.com
d343b8e159 added some debug statements for JSfx.cpp
minor correction to handling download delegate removal
changed constant literals to use constant labels.  Not sure why this was changed in the first place as it didn't need to be.
2012-02-05 23:32:55 +00:00
techdragon.nguyen@gmail.com
dc16ba2adb i think this should fix the psp builds. Thanks to Zeth for the help on this one. 2012-02-05 17:31:04 +00:00
techdragon.nguyen@gmail.com
37566d148d followup fixes to psp version JSFx.cpp .
Added psp JSfx.cpp to iOS project.
2012-02-05 12:30:53 +00:00
techdragon.nguyen@gmail.com
5c3baedf83 moved Wagic Version macros into a new header file so that iOS can use it.
updated iOS port to use wagic versioning macros.
2012-02-05 11:16:43 +00:00
techdragon.nguyen@gmail.com
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
techdragon.nguyen@gmail.com
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
techdragon.nguyen@gmail.com
8241295712 this seems to resolve the trophy room loop on touch/click interfaces when you exit the deck editor and other parts of the game 2012-01-31 14:07:23 +00:00
Xawotihs@gmail.com
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
techdragon.nguyen@gmail.com
c42ba32ae7 added new buttons for shop for New Cards and displaying the card list. 2012-01-30 18:02:26 +00:00
techdragon.nguyen@gmail.com
fb43b9012b sync swipe motion in deck viewer act accordingly to a swipe/pan on corresponding platform (iOS vs everything else) 2012-01-30 10:23:40 +00:00
Xawotihs@gmail.com
28be95b401 Updated Qt frontend to latest Scroll interface 2012-01-29 22:34:55 +00:00
techdragon.nguyen@gmail.com
efd72b8fd2 udpate to scroll signature from previous commit. 2012-01-28 02:46:13 +00:00
techdragon.nguyen@gmail.com
9faf2ffc72 reverted changes to the Scroll/OnScroll method signatures. 2012-01-27 23:47:02 +00:00
Xawotihs@gmail.com
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
techdragon.nguyen@gmail.com
a438c9135e vs 2010 update for deck editor changes as well as SDL update 2012-01-26 14:54:17 +00:00
techdragon.nguyen@gmail.com
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
techdragon.nguyen@gmail.com
dda048c616 forgot to check in the JGE changes from previous commit 2012-01-25 22:31:58 +00:00