Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,304 Commits 14 Branches 14 Tags
eb8da4d4b282d99a04f5590dccce6d184ba9f8eb
Commit Graph

57 Commits

Author SHA1 Message Date
Vittorio Alfieri
d9e3101212 Fix for IP Address resolution on Wondows for 2 Players mode. 2021-01-03 14:19:16 +01:00
Rolzad73
85f66a8fec X11 build fixups 
- fixed -Werror=misleading-indentation warning
- fixed -Werror=nonnull-compare warning on xll and QT builds
- PNG_LIBPNG_VER backward compatibily changes
- giflib backward compatibily changes
- resolved some undefs for X11 build
- silenced some small compile warnings in JGE Makefile
- added -DTIXML_USE_STL to remaining build types (PSP had it added)
- fixed x11 Boost incompatibility issue part of #548
- reworked PrecompiledHeader.h platforms used
 2017-01-28 04:19:46 -05:00
xawotihs
9e77899535 Adds missing breaking macosx compilation without boost 2015-09-26 09:44:11 +02:00
xawotihs
b8da46ac18 Fixed phonon support. 2014-11-23 16:27:18 +01:00
xawotihs
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
xawotihs
03d4f8ffa1 Added Qt Multimedia support in order to replace Phonon. Currently does not work on Mac. 2014-01-26 23:56:15 +01:00
xawotihs
38e19f7d35 Removed mingw32-qt 
Merged SDL and QT .pro files
Removed glu dependency in corewrapper and JGfx to enable mingw cross compilation.
 2013-12-07 18:57:57 +01:00
Tobias Loose
0db2925e7a Fix initialization orders 2013-11-29 18:44:30 +01:00
Tobias Loose
031f2dbffb Fix Valgrind warnings appearing during the test suit. 2013-11-29 18:21:53 +01:00
xawotihs
fea5b04a77 Fixed compilation on Windows. 2013-10-31 23:48:19 +01: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
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
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
2acdf55548 Fixed compilation on Windows with gcc 2012-04-15 11:51:18 +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
Xawotihs
bb65d2dc12 - various compilations fixes for Symbian 
- small cleanups of the TestSuite and Player classes
 2011-09-19 19:49:45 +00:00
Xawotihs
c188b4d104 Fixed "Werror" related compilation problems on Linux and Meego. 2011-08-14 18:09:02 +00:00
Xawotihs
e09fe7570e Fixed Phonon sound support. 2011-07-19 21:28:46 +00:00
Xawotihs
9dccc885d6 Updated the Qt project to work on Desktop/Maemo/Meego/Symbian. Removed all dependencies except Qt and OpenGl. 2011-07-17 18:18:17 +00:00
Xawotihs
bfa9b6c813 Fixed issue 691. 2011-07-01 21:59:35 +00:00
wrenczes@gmail.com
4018d17370 more compiler warning cleanup. 2011-06-02 05:48:37 +00:00
wrenczes
ffda1d0548 style formatting, some warning cleanup. 2011-05-25 06:59:44 +00:00
Xawotihs
883f92d8e2 Fixed IOS build 2011-05-07 17:10:01 +00:00
Xawotihs
f2a52edba7 - wait for SDL events intead of pooling them, this allow very smooth CPU usage 
- added texture deactivate around each renderer call implemented in opengl es 1.1. It fixes a couple of artifacts but a couple are remaining
- added a compilation switch to allow simulation of opengl es 1.1 on desktop
 2011-04-25 21:26:12 +00:00
Xawotihs
137ccdf446 - Activated debug and orientation management in Android manifest 
- Coded double-click and orientation change for Android
- Clean up debug code badly introduced in opengl code in r3529
- updated Qt project to link against boost on linux
 2011-04-25 10:04:44 +00:00
wrenczes@gmail.com
be2a4ee4ec Mostly formatting cleanup, but a couple of openGL related fixes : don't call state change functions if their params haven't changed. In particular, we call ClearScreen() in several places in the code, but BeginScene() already does this. According to several openGL performance guides I skimmed through, if you call clear more than once per frame draw, performance will suffer. 
This seems to help with issue r103 - on my win machine, it's substantially better; on psp, not quite as drastic, but it's still better than before.
 2011-04-24 10:00:37 +00:00
Xawotihs
832904dce1 - Defined keys translation for SDL config 
- Added boost thread files, that fixes all the threading/compiling/linking problems on Android ...
- Added opengles 1.1 code, there are still some bugs I need to tackle ... and I should realy split this file now !!!
- Added Android debug traces
- Hardcoded resources to "/sdcard/Wagic/Res" for the moment on Android
- Added a wagic SDL project for desktop, and the related SDL frontend used for Android. This frontend is currently mostly desktop based, it needs some work to be fully useable with touch and gesture on Android.
 2011-04-23 21:30:36 +00:00
wrenczes@gmail.com
58e340f30c Removed the precompiled header include from JSocket, as the precompiled header is actually in the mtg project and this is cross pollination. Moreover, mtg specific header changes that we might put in the precompiled header will cause this file in JGE to recompile each time. If we think it'll improve things, we could put in a separate precompiled header in JGE, but I'm not sure it's enough of a gain to bother. 2011-04-22 14:59:10 +00:00
wrenczes@gmail.com
0b821c9b4f Fixed the window rescaling to do letter/pillar boxing per the email thread. 2011-04-13 04:55:17 +00:00
wrenczes@gmail.com
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
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
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
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
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
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
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
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
4951442499 Improved texture loading on iOS 2010-11-25 23:18: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
Xawotihs
8339cdd3b3 iOS compilation fixes 2010-11-19 23:16:31 +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
fcb8aeaa28 Added error handling and moved glEnable(GL_TEXTURE_2D) to fix issue 484 2010-10-09 10:18:59 +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