Commit Graph

243 Commits

Author SHA1 Message Date
Xawotihs 29e9ea62c3 Fixed the build problem with VS2008 and actived multithreaded build while I was at it ... you guys liked to wait ? =) 2011-03-19 08:35:57 +00:00
Xawotihs f9be0a6341 - reworked completly the JNetwork, JSocket interface (had to ifdef out the PSP socket code)
- added 2 menus to wait for connection and wait for deck selection
- tested compilation on Qt Linux, Qt Windows and PSP
- deactivated everywhere (NETWORK_SUPPORT to activate).
2011-03-13 21:19:02 +00:00
wrenczes@gmail.com baf0343063 Makefile changes in JGE to include the boost path. Added a missing include dependency on shared_ptr. 2011-03-02 09:26:31 +00:00
wrenczes@gmail.com 297f87eb04 Fixed relative path includes of JGE headers. 2011-03-02 09:04:31 +00:00
wrenczes@gmail.com 9901329caf Moved Threading.h into JGE so that it can be used at that level. 2011-03-02 08:14:47 +00:00
wrenczes@gmail.com 772828bced Removed some overly noisy log tracing in JFileSystem that I had previously put in. One nice thought would be the addition of a 'volume' to tracing messages so that you could choose how much verbosity you want in the logging output, but that's a luxury for the moment. 2011-03-01 08:57:31 +00:00
wrenczes@gmail.com 1c228aba7a Make the ToHex() util function always available, instead of debug only on win/linux. Useful for tracing addresses in psp log files... 2011-03-01 08:53:15 +00:00
Ittobaal@gmail.com c6849d35d5 Prefix VS Postfix increment 2011-02-09 20:06:15 +00:00
wrenczes@gmail.com 9085b2a0e1 Some minor reformatting, JLOG instrumentation of the zip file loading. 2011-02-01 05:53:19 +00:00
wrenczes@gmail.com f2cbd883a6 Apply LF line endings as an SVN property, this time on the JGE source files. 2011-01-28 06:03:52 +00:00
Xawotihs f90709403f - Fixed scissor bug introduced in r2912.
- Adds code to support TapAndHold gesture, it does not seem to work with
the N900, but it works fine on Linux.
- Removed code checking opengl version as it's no more needed.
2011-01-16 22:47:07 +00:00
Ittobaal@gmail.com 7eaa30e996 add newline @ end of JLogger.h 2011-01-16 17:48:11 +00:00
Xawotihs 04c1ff23dd Fixed OpenGL 1.1 code with Qt. The Qt version on windows now uses it by default instead of OpenGL 2.0. 2011-01-16 17:31:24 +00:00
wrenczes@gmail.com eac6d74ebd Added a couple of null guards against invalid quads / textures in the render() call, with JLOG calls to trace this out if we should hit one of these cases. (Reformatted tabbing in the function while I was there.) 2011-01-11 10:36:15 +00:00
Ittobaal@gmail.com 07ef902d85 Added newline to end-of-file 2011-01-08 12:24:39 +00:00
Xawotihs 58f4631dc2 Removed a phonon warning on maemo, added a debug trace for the launching path 2010-12-30 22:03:52 +00:00
Xawotihs a77e550bff Fixed compilation on Linux and a resizing issue 2010-12-30 02:17:22 +00:00
wrenczes 39e6d4f2b5 Reworked some fixes submitted to us by ittobaal. Several fclose calls he suggested had no bearing (if fopen fails, calling fclose on a null pointer is pointless), but the (missing) array deletions were definitely valid bugs. The fix for CreateTexture() was a little loose, so I cleaned it up somewhat.
Issue: 566
2010-12-27 20:00:33 +00:00
Xawotihs 53c68f4104 Replaced double left click support for desktop version by simple left click. Maemo still uses double click. 2010-12-24 03:19:26 +00:00
Xawotihs b3fb8022a0 Deactivated the QImage code as it causes problems on win7 and vista. This implies that the Qt version still depends on libjpeg, libpng and libgif 2010-12-23 07:57:50 +00:00
Xawotihs 093d229c50 Basic check of GL versions supported before starting. 2010-12-23 00:51:38 +00:00
Xawotihs 7a0bf2c78c Changed the Qt images to load in buffers using dimensions multiple of power 2. Simplified the memory management as well. 2010-12-22 22:20:20 +00:00
Xawotihs a5c5a9d60b Fix resize management for the mac version 2010-12-21 16:05:59 +00:00
Xawotihs 164b9837d9 Merged the iOS resizing/selecting code into the Qt frontend. It works perfectly with OpenGL 2.0, it's buggy with OpenGl 1.1. 2010-12-21 01:10:01 +00:00
Xawotihs 3459a04d2a Final fix for maemo dependency and fix the release of keys in the Qt frontend 2010-12-18 19:37:16 +00:00
Xawotihs ae9ae7783b gcc does not like iomanip stuff without namespace around 2010-12-16 18:24:39 +00:00
wrenczes@gmail.com 87909bed08 Fix for issue 550, heap crashed game in turn 6.
The core problem I fixed was in CardView's (missing) destructor - on construction, a CardView will set itself as a member of its parent CardInstance, so it stands to reason that when it's about to be destroyed, it should do the inverse and remove itself in the same fashion from its parent.   This explains why weird graphic glitches were seen when casting Animate Dead on cards in a graveyard - the position data it was trying to use was already deleted from memory (a cardview is deleted on cleanup at the end of a turn if it's gone to the graveyard), but no one nulled out the deleted card view reference from the instance, so we'd access invalid data.

Some peripheral changes in this checkin:  two helper functions in CardGui (GetCenterX, GetCenterY)  that are part of my navigation patch are included.  They're unused in the current code base, so this has zero impact. (I'm only checking them in as it's more work than it's worth to refactor them into a separate changelist.  The core of the nav patch requires my mods to Closest.cpp / CardSelector.cpp to have any effect.)  I also included a helper function in the debug routines to spit out hex pointer addresses in trace outputs, which I used to chase down this bug.
2010-12-16 09:32:42 +00:00
Xawotihs 3cb652087d iOS frontend and XCode project 2010-12-12 15:58:47 +00:00
Xawotihs 01ac3d1a55 - cleanup image dependencies in QT project 2010-12-11 22:46:15 +00:00
Xawotihs 594b3abf1e Qt project fixes on Mac 2010-12-06 22:30:25 +00:00
Xawotihs e8f5d2d349 iOS texture management fixes 2010-12-06 22:25:28 +00:00
Xawotihs 13f467a9ef Activated QT image support, removed freetype, jpeg, png, gif libs dependencies in the Qt project. 2010-12-06 20:06:03 +00:00
Xawotihs 488a055736 Added code to use Qt instead of libpng, libgif and libjpeg. Deactivated for the moment (works fine on Linux). 2010-12-04 14:19:09 +00:00
Xawotihs fb75d31887 activated log on iOS 2010-12-04 14:15:29 +00:00
wrenczes@gmail.com 92bbb78ed1 Fix for [PSP|PC]ability menus and card view switch causes a crash. This broke as a side effect to the addition of the 'details' option that Mike added - the ActionStack had very rigid interpretations of what a valid control ID would be (either -1, or a valid id in its container). As kInfoMenuID is assigned a value of -200, this would crash when attempting to look up that index value in the vector.
I've patched the problem so that ActionLayer checks for a valid ID before doing anything, and does a no-op for IDs it doesn't know how to handle. However, this only fixes the problem during gameplay.  It's quite possible that hitting the triangle button in other places in the app might equally cause a crash.


Issue: 544
2010-12-04 04:25:43 +00:00
wrenczes@gmail.com 4b7e024ce6 added DebugRoutines.h to the JGE VS2010 project. 2010-12-03 09:51:12 +00:00
wrenczes@gmail.com 2693f35506 Fixed the graphics whiteout bug I introduced when switching profiles. When Refresh() was being called on the texture, the bitmap wasn't been re-transferred back into the openGL context.
While debugging this, I noticed a separate issue:  when changing profiles, we'd actually call refresh twice.  Removed the spurious call, as reloading profiles doesn't need to concern itself with the image cache - that's already covered by the game options menu.

Also did some minor formatting / cleanup in the JGfx code for PSP - stubbed out a bunch of JLOG calls I had put in while debugging the PNG loading code.
2010-12-02 04:04:03 +00:00
linshier aa6aa20ba5 Fixed left offset parameter handling for center/right align string drawing. A brief note about string drawing, offset and display width is added in the WFont.h 2010-12-01 08:01:13 +00:00
wrenczes@gmail.com a0427d99df These files were meant to be part of the previous checkin. I blame AnkhSVN yet again. Someone needs to write a Subversion tool with proper changelist support! 2010-12-01 07:20:26 +00:00
wrenczes@gmail.com 3a927dace9 Scope checkGlError() calls to be only active in debug targets (no-op in release). 2010-12-01 05:28:01 +00:00
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