5e6c0c612e
Fixed the breakage in the Deck Editor Menu, where the app would hang, looping on trying to word wrap a string. Erwan, pls review. Char is signed here, I'm not sure what the compiler warning was that you saw - NDK related? Does it treat all chars as unsigned?
2011-04-21 23:51:05 +00:00
8ff6839c8d
Some preparation work for new platform support.
...
- Added a "PSP" compile-time define to clean up some compile time checks (replaced !WIN32 && !LINUX && !IOS with PSP)
-- Wil, I am aware that this is redundant with the PSPENV variable you introduced recently, I think we can clean that up easily
-- This looks like lots of changes, but most of the time I just moved some blocks here and there
-- tested on VC 2010, PSP, and a bit of NDK
-- I might have broken maemo, iOS, or Linux compilation, can you guys check?
- Fixed some warnings reported by NDK
- NDK still does not compile because recent boost additions (mutex, etc...) are apparently not supported
2011-04-21 13:16:11 +00:00
d06965d95e
added tha menu constants variables to fix compiling on vc2008, i guess free version doesnt add it automatically or something becuase mike was able to compile without them
2011-04-20 20:40:28 +00:00
9141f28865
Disabled some JLOG traces in the MP3 code, as they run on a separate thread & tend to hang the psp when logging is enabled.
2011-04-20 06:33:59 +00:00
1117840621
Removed spurious warnings about secured Win API calls by adding _CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS to the compiler settings. This only eliminates the warnings, but doesn't fix the slow compile times - I'll fix that next...
2011-04-20 02:14:37 +00:00
40958170fa
Fix to have r3450 at least compile on linux 64 bits
2011-04-19 19:04:12 +00:00
ab133e9f98
Err, stupid of me. Now passing in the PSPENV flag correctly...
2011-04-19 05:49:37 +00:00
79835dda33
Slight modification to the DebugTrace calls so that if compiling against debug on psp, the call becomes std::cout. This allows the debug trace calls to mirror out to the console window that's running pspsh.
2011-04-19 04:48:42 +00:00
7e884b53f9
Added a PSPENV environment variable to the psp make files. Also fixed a minor compile bug where the debug flag for psp forced JLOG support, which in turn enabled a JGE_LOG_FILE macro that has long since been removed from the code.
2011-04-19 04:35:42 +00:00
0b821c9b4f
Fixed the window rescaling to do letter/pillar boxing per the email thread.
2011-04-13 04:55:17 +00:00
4e2cc08bb1
Better solution for a (real) fullscreen mode. (Last tweak, promise!)
2011-04-11 04:48:21 +00:00
98220afb46
Something that's been bugging me for a while, and I finally decided to do something about it: fullscreen toggle never worked on Windows. I've now made the F key do a three-way toggle between lo-res (ie standard psp resolution), hi-res (psp resolution doubled, so 960 * 544), and fullscreen (well, not exactly fullscreen, it's a window sized to your desktop's work area; if you have a weird sized desktop, you might get clipping).
2011-04-11 00:30:50 +00:00
8add655df7
Formatting cleanup, modified a function to pass by const reference.
2011-03-31 11:08:58 +00:00
64d421b8b8
Fixed a namespace collision that was causing compile errors in VS2010. bind() was being interpreted as std::bind(), not the winsock bind() call.
2011-03-31 11:07:50 +00:00
e7f2ae4e6e
Added a Boost::recursive_mutex variant to the threading support. Also bumped up the default stack size of a worker thread to 256K, and moved the thread priority slightly down as 0x12 is pretty aggressive for a default value.
2011-03-31 10:37:41 +00:00
d934d9d30f
Fixed a compilation problem on PSP with the minpspw 11.1 SDK, which changed the definition of a u32 from unsigned long to unsigned int.
2011-03-28 04:40:44 +00:00
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
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
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
297f87eb04
Fixed relative path includes of JGE headers.
2011-03-02 09:04:31 +00:00
9901329caf
Moved Threading.h into JGE so that it can be used at that level.
2011-03-02 08:14:47 +00:00
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
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
c6849d35d5
Prefix VS Postfix increment
2011-02-09 20:06:15 +00:00
9085b2a0e1
Some minor reformatting, JLOG instrumentation of the zip file loading.
2011-02-01 05:53:19 +00:00
f2cbd883a6
Apply LF line endings as an SVN property, this time on the JGE source files.
2011-01-28 06:03:52 +00:00
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
7eaa30e996
add newline @ end of JLogger.h
2011-01-16 17:48:11 +00:00
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
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
07ef902d85
Added newline to end-of-file
2011-01-08 12:24:39 +00:00
58f4631dc2
Removed a phonon warning on maemo, added a debug trace for the launching path
2010-12-30 22:03:52 +00:00
a77e550bff
Fixed compilation on Linux and a resizing issue
2010-12-30 02:17:22 +00:00
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
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
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
093d229c50
Basic check of GL versions supported before starting.
2010-12-23 00:51:38 +00:00
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
a5c5a9d60b
Fix resize management for the mac version
2010-12-21 16:05:59 +00:00
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
3459a04d2a
Final fix for maemo dependency and fix the release of keys in the Qt frontend
2010-12-18 19:37:16 +00:00
ae9ae7783b
gcc does not like iomanip stuff without namespace around
2010-12-16 18:24:39 +00:00
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
3cb652087d
iOS frontend and XCode project
2010-12-12 15:58:47 +00:00
01ac3d1a55
- cleanup image dependencies in QT project
2010-12-11 22:46:15 +00:00
594b3abf1e
Qt project fixes on Mac
2010-12-06 22:30:25 +00:00
e8f5d2d349
iOS texture management fixes
2010-12-06 22:25:28 +00:00
13f467a9ef
Activated QT image support, removed freetype, jpeg, png, gif libs dependencies in the Qt project.
2010-12-06 20:06:03 +00:00
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
fb75d31887
activated log on iOS
2010-12-04 14:15:29 +00:00
wrenczes@gmail.com
wagic.the.homebrew
omegablast2002@yahoo.com
wrenczes
Xawotihs
Ittobaal@gmail.com