Commit Graph

203 Commits

Author SHA1 Message Date
Xawotihs
4f54425fb3 Added return and esc key as binding to MENU 2010-11-27 16:08:11 +00:00
Xawotihs
4951442499 Improved texture loading on iOS 2010-11-25 23:18:57 +00:00
Xawotihs
8d758d4775 Changed fps on desktop to run at 200 fps, changed mobile to start in
fullscreen
2010-11-22 22:58:57 +00:00
linshier
4c7b4f4df9 Fixed texture binding in JRenderer. Note that if we want to bind or rebind a texture, we should set mCurrentTex to the target texture id first. Otherwise, it can cause some display bugs in some situation as BindTexture() tracks down the mCurrentTex for an optimization. 2010-11-21 16:09:45 +00:00
linshier
bf3d01ae74 Added linebreak support for JTTFont in JGE. 2010-11-20 15:40:53 +00:00
linshier
deea874591 Fixed the setsize bug for JTTFont in JGE. 2010-11-20 15:24:11 +00:00
wrenczes@gmail.com
e0872b852d Fixed the PSP build. Turns out that the make file wasn't properly cleaning out the .pch file when running make clean. Also renamed JgeRect to JRect for consistency with other class definitions in JTypes. 2010-11-20 06:34:13 +00:00
Xawotihs
3725958fc3 Fix mouse support in menus and first screen 2010-11-20 00:33:37 +00:00
Xawotihs
8339cdd3b3 iOS compilation fixes 2010-11-19 23:16:31 +00:00
wrenczes@gmail.com
76d5b57c1e More VS2010 configuration changes - includes a boost include/lib path (not currently in the trunk), and new file additions/deletions. 2010-11-19 07:14:19 +00:00
techdragon.nguyen@gmail.com
2a8f8074e6 New descriptive text popup feature for deck selection
http://wololo.net/forum/viewtopic.php?f=13&t=2423
2010-11-18 15:48:48 +00:00
wrenczes@gmail.com
8ad597f565 Fixed the swizzle functions for the PNG loading support in JGE. (This is a psp-only fix, it has no impact on the win build.)
This is the main fix for the situation where we try to load PNGs after the image cache has been saturated - instead of requiring 1 Meg as a temporary buffer to perform the swizzle operation on a full image (ie 512 * 512 texture size), these mods allow the swizzle to work in line with a temp buffer of  512 * 8 lines (ie 16K of memory).  I also fixed a case where the swizzle didn't operate correctly on PNGs that weren't an even multiplier height of 8 - we'd drop the remaining lines on the floor, creating garbage lines at the bottom of those images.
2010-11-10 23:50:26 +00:00
wrenczes@gmail.com
eea91e9a1a Two changes here:
1) Consolidated the Loggers so that we only have one in JGE.  Added a helper constructor/destructor to the JLogger class so that you can instantiate one at the top of a function, it'll trace out a 'start' and 'end' message when it goes in & out of scope.
2) Fixed the crash part of a bug I've been chasing down where, on the psp, after saturating the cache, the game dies when trying to reload the background PNG image of the deck menu. We still need to fix the root cause of the failure (not enough memory to allocate a temporary buffer for the swizzle operation), but at least the psp doesn't lock up anymore.  I've also left behind all the log traces I inserted into the LoadPNG code, since we'll probably need them again.
2010-11-10 02:24:39 +00:00
wrenczes@gmail.com
3525696523 Fixed the build - missing file from my last submit. 2010-11-09 23:17:40 +00:00
wrenczes@gmail.com
3eeb8a6465 - renamed WResourceManager::autoResize() to ResetCacheLimits(), since the function doesn't actually resize anything. It's merely setting clamping limits on when we should purge the cache.
- fixed the debug framerate calculation / drawing code (consolidated duplicated functions & variables mDelta vs a win-only mDeltaTime, no reason to have two), repositioned it to draw on the bottom left (it was colliding with other debug text for the cache info).
 - for debug testing purposes, added a #define override to force the image cache to work with less memory (I've picked 8 megs, which is what the psp seems to use - the normal default on win/linux is 20 megs).
2010-11-09 19:01:38 +00:00
wrenczes@gmail.com
6d8e7edcbf Improvements against http://code.google.com/p/wagic/issues/detail?id=50, Mana animation slows PSP down.
Two things: 1) there was an extremely inefficient implementation in the particle system of a queue where, when particles expired, each expired element would be copied over(replaced) by one at the rear of the container. Depending on the performance of the update, this could range anywhere from 100 to 500 (the max particle count) memcpy operations per update loop.  I replaced the flat array with a std::list, and simply pop the unneeded elements when they expire now.  This seems to shave ~30% off the time spent in the Update() call.

2) Hardcoded the number of emitters for the mana particles to 60 (the default in the psi file seems to be around 114).  This reduces the amount of iterations per tapped mana by just over half, which also helps the performance, and it's not really noticeable - the glow effect is a *tiny* bit more muted, but chances are, if you didn't read this comment, you probably wouldn't have noticed.

I've gone from having my psp start lagging noticeably at 8 tapped mana to about 12 - at this point, I think the bigger remaining lag is the fact that when there's a cache miss for a card image, we're doing synchronous i/o on the main thread - the framerate drop this causes is far more noticable than the mana particle lag.
2010-11-08 07:27:19 +00:00
wagic.the.homebrew@gmail.com
5d907f5abe Erwan
- Added a possibility to put a file "Res.txt" instead of the folder "Res". The file Res.txt is a simple 1 line text file, telling where to find the Res folder, terminated by "/". For example: "../../wagic_res".
This addresses issue 428 . This could also help us in the future, to develop mods.
2010-11-07 09:26:29 +00:00
wrenczes@gmail.com
3c19533a4c Added the notion of a 'cancel' button, and unified all the 'cancel' menu IDs to be kCancelMenuID (ie -1). I've slaved the Menu button (ie Esc on win, 'Start' button on PSP) to this - the idea being, if you hit the Menu button to bring up a menu, hitting it again will dismiss it without doing anything, which is pretty standard behavior for most console/computer games. 2010-11-07 02:08:17 +00:00
Xawotihs
1bde7b1dea Make it at least compile ... 2010-11-05 07:20:01 +00:00
wrenczes
5799ebb0e2 Same actualWidth/Height changes for QTmain. 2010-11-02 04:08:05 +00:00
wrenczes
858950fb9d Incremental fix on my Navigator work - switched out global to JGE vars actualWidth/Height to be real accessible members of the JRenderer instance, so that we can actually access what the real display width is from within the MTG project. This makes the fix for enchantment zone targetting work when the window is resized on Win32. 2010-11-02 04:07:25 +00:00
Xawotihs
44e097e88c reduced framerate to 30 fps, stopped refreshing the UI when the window is hidden or when the screen is off. 2010-10-19 22:09:16 +00:00
wrenczes@gmail.com
d35367503d Modifications required to build against the latest (0.10.0) PSPSDK. Note that this is a breaking change, these mods are not backwards compatible with the 0.8.9 version of the PSPSDK.
To download the latest Minimalist SDK, go here:

http://sourceforge.net/projects/minpspw/
2010-10-19 08:45:36 +00:00
Xawotihs
0789d6e7e9 Activates mouse tracking 2010-10-18 20:25:01 +00:00
wrenczes@gmail.com
832f11c153 Switched the managed JQuad container implementation from a vector to a map. This speeds up the cache lookup time from O(n) to O(log n). Hard to see a noticeable difference on win, but it definitely feels snappier on my psp, for instance, when browsing your library for a card, or your graveyard, etc.
I'm also noticing that the GetQuad(int) variant never seems to get hit, so I suspect that the ID lookup map is redundant.  I left it alone as the JResourceManager base class forces the need for the function; I need to spend more time looking at just how much of JResourceManager we actually use at this point.
2010-10-17 16:54:08 +00:00
wrenczes@gmail.com
7e780e18c1 For the windows version, if running with fullscreen disabled, center the main window instead of creating it top-left all the time.
Also renamed WindowRect to windowRect & PixelFormat to pixelFormat for consistency with other locally declared variables.  (Uppercase should be reserved for class names, ie WindowRect is the class/struct, windowRect is an local object in your code.)
2010-10-16 15:28:41 +00:00
wrenczes@gmail.com
0ef555dca9 Minor tweaks to the VS2010 project files, including turning down the code analysis verbosity. 2010-10-16 15:20:27 +00:00
Xawotihs
0abe60542a Fixed Qt project on windows 2010-10-16 12:19:44 +00:00
Xawotihs
e342103204 Added support for left mouse click and zoom buttons 2010-10-10 21:58:02 +00:00
Xawotihs
75b8a0c328 Added support for left mouse click 2010-10-10 21:57:27 +00:00
Xawotihs
7439d81454 Work around issue 457, not fully fixed. 2010-10-09 10:36:42 +00:00
Xawotihs
fcb8aeaa28 Added error handling and moved glEnable(GL_TEXTURE_2D) to fix issue 484 2010-10-09 10:18:59 +00:00
Xawotihs
977257aee3 moved glEnable(GL_TEXTURE_2D) to fix issue 484 2010-10-09 10:08:59 +00:00
Xawotihs
fb484f0f00 Removed X dependency when compiled with Qt 2010-10-07 21:40:09 +00:00
wrenczes@gmail.com
df2b145a42 Minor project changes - use a vsprops file to locate the extra includes instead of requiring folks to manually copy dirent.h & stdint.h into your VC include dir. 2010-10-07 04:06:16 +00:00
wrenczes@gmail.com
9c982475fe Some minor casting issues that trip up the 0.9.6 pspsdk when compiling. 2010-10-06 09:22:44 +00:00
wrenczes@gmail.com
88ac1dd9a6 2010-10-06 08:45:55 +00:00
Xawotihs
2881543b78 added support of right and middle mouse button and also wheel mouse while I was at it. 2010-09-28 20:00:31 +00:00
Xawotihs
81cdfb8c9b basic support for a touch interfacing 2010-09-26 22:21:52 +00:00
Xawotihs
69b30b82cb - tab cleanup
- replace unix path management code by Qt one
2010-09-25 17:21:34 +00:00
linshier
5867b9679e Additional fix for issue 460. Tested on Linux. 2010-09-23 05:11:05 +00:00
wagic.the.homebrew@gmail.com
e94c070050 erwan
- long term fix for issue 460 and issue 461
2010-09-23 04:00:22 +00:00
Xawotihs
4ba8badabd - Fixed issue 460 on Linux with Qt, this configuration will still use OpenGl 1.1. Linux with Qt will use OpenGl 2.0 and thus display the bug while it's not fixed.
- Fixed issue 461 for all the platforms.
2010-09-22 22:51:49 +00:00
wagic.the.homebrew@gmail.com
3965505b15 wololo
- Adding DJardin's port to N900
2010-09-16 13:12:05 +00:00
wagic.the.homebrew@gmail.com
1332842025 Erwan
- bug fix in JGE++ audio (improve HBL compatibility)
- Added new rewards in story mode: random card, card (either by "name" or id), specific set
- Story mode: added possibility to choose music, and bg for duel.
-- See "01. Where it all begins" for examples of new features
2010-07-19 13:44:26 +00:00
wagic.the.homebrew@gmail.com
fd8645d1a4 Erwan
- JGE updates : main accepts argv/argc. Compilation variables for MP3 and Network support
- Minor fix in Wagic (potentially fixes crashes when using activated abilities several times in onr turn. Couldn't reproduce the issue)
2010-07-11 10:56:12 +00:00
wagic.the.homebrew@gmail.com
5cbc8e4b4a Erwan
- fix issue 425 (Echo)
2010-06-21 12:25:38 +00:00
jean.chalard
f14f56b9ce J :
* Fix 64-bit compilation
2010-06-13 09:38:58 +00:00
wagic.the.homebrew@gmail.com
d756005093 Erwan
- fix for issue 390 (tokens available in shop)
- added "log" features in makefile
2010-06-12 06:06:27 +00:00
wagic.the.homebrew@gmail.com
ded3736c6b Erwan
-fix issue 410
2010-05-07 12:46:00 +00:00