Michael Nguyen
|
63561e6122
|
update Xcode build preferences as recommended by XCode.
|
2014-04-13 11:39:40 -07:00 |
|
Michael Nguyen
|
d2390b1227
|
updated project file for iOS to work with current codebase
- added missing source/headers (GameView.h, CarouselView.h, etc )
- removed dependency on admob static library
- removed CardEffect.h and CardEffect.cpp from project reference
- removed -no_implicit_dylibs flag (apparently no longer supported)
- added -fno-objc-arc (turns off ARC compilation for entire project)
- added -DTIXML_USE_STL
|
2014-04-13 08:34:21 -07:00 |
|
Michael Nguyen
|
d0799ea3f2
|
updating to latest code from master
Merge branch 'master' into develop
|
2014-04-13 08:26:53 -07:00 |
|
Xawotihs
|
44cbfbb1fb
|
Merge pull request #601 from ZobyTwo/cleanup_3
Remove dead code and fix circular initialization
|
2014-03-13 20:20:12 +01:00 |
|
Tobias Loose
|
b078dd1f6a
|
Fix android makefile
|
2014-03-11 17:31:25 +01:00 |
|
Tobias Loose
|
225dd23753
|
Fix makefile
|
2014-03-11 17:19:05 +01:00 |
|
Rolzad73
|
51b4755242
|
Update README.md
Added sample play-through video link
|
2014-02-05 23:39:57 -05:00 |
|
Tobias Loose
|
8f233b3027
|
Avoid circular initialization
|
2014-02-03 19:44:51 +01:00 |
|
Tobias Loose
|
197540763e
|
Remove unused Effects.h/.cpp and class Effect
There was an empty vector of effect* in PlayGuiObject.
|
2014-02-03 13:52:40 +01:00 |
|
xawotihs
|
30d92eb68c
|
Should fix issue #497 with the broken freezing the game.
|
2014-01-18 22:50:16 +01:00 |
|
xawotihs
|
6e6a0fd5c2
|
OMG I so hate shells
|
2014-01-18 16:00:14 +01:00 |
|
xawotihs
|
cd4a980182
|
More debug
|
2014-01-18 15:26:09 +01:00 |
|
xawotihs
|
aad54fd98d
|
Adds debug in build script
|
2014-01-18 14:57:23 +01:00 |
|
xawotihs
|
6b7a49506c
|
Should fix the stringifying issue
|
2014-01-18 14:23:26 +01:00 |
|
xawotihs
|
7ecf67c176
|
And again
|
2014-01-18 13:37:43 +01:00 |
|
xawotihs
|
77aeb2d0ac
|
Fixed release name
|
2014-01-18 13:29:50 +01:00 |
|
xawotihs
|
7a9f989104
|
Adds some URL error log
|
2014-01-18 12:46:27 +01:00 |
|
xawotihs
|
ae06bebd24
|
Merge branch 'github_downloader'
|
2014-01-18 12:11:08 +01:00 |
|
xawotihs
|
042fb7b376
|
Tries to fix Android compilation
|
2014-01-18 11:18:27 +01:00 |
|
xawotihs
|
c3583ade01
|
Updated resource name and URL for android project
|
2014-01-17 23:25:48 +01:00 |
|
xawotihs
|
f97d9805dd
|
Removed build number in released filename and added computation of resource URL based on release name.
|
2014-01-17 21:50:10 +01:00 |
|
xawotihs
|
1d33de59a9
|
Fixed compilation issue
|
2014-01-12 22:56:53 +01:00 |
|
xawotihs
|
0c4b09891b
|
Removed hardcoded testing values and used 32 bits file size instead of 64 bits.
|
2014-01-12 22:40:45 +01:00 |
|
xawotihs
|
25955303e7
|
Adds a Downloader component to JGE able to download and cache files.
|
2014-01-12 22:16:35 +01:00 |
|
Rolzad73
|
27b75eecb0
|
Merge pull request #600 from WagicProject/android_build_update
update android build tools version
|
2014-01-09 12:33:11 -08:00 |
|
Rolzad73
|
e40921cf13
|
update android build tools version
|
2014-01-09 14:57:06 -05:00 |
|
Rolzad73
|
083cebcc7e
|
updated credits text
|
2014-01-09 14:46:58 -05:00 |
|
Rolzad73
|
a722736335
|
Merge pull request #599 from WagicProject/android_travis_explicit
Attempt to make android tools fetching for TravisCI explicit and futureproof
|
2014-01-08 08:40:47 -08:00 |
|
Rolzad73
|
c483c20c81
|
attempt to make android tools fetching for TravisCI explicit and futureproof
|
2014-01-08 11:14:47 -05:00 |
|
Dmitry Panin
|
dec1caa43c
|
Revert "Fixed issue with multiple basic abilities in TargetChooser"
This reverts commit d9816c7ad0.
|
2014-01-04 18:40:59 -08:00 |
|
Dmitry Panin
|
9526e22118
|
Fixed grave pact
|
2014-01-04 18:14:15 -08:00 |
|
Dmitry Panin
|
d9816c7ad0
|
Fixed issue with multiple basic abilities in TargetChooser
E.g. card create[trample;haste] wasn't handled properly
|
2014-01-04 18:13:22 -08:00 |
|
Dmitry Panin
|
8e327a27df
|
Fixed formatting
|
2014-01-04 18:13:22 -08:00 |
|
xawotihs
|
43fe67d7d8
|
Adds executioners_swing tests in _tests.txt
|
2013-12-31 18:38:30 +01:00 |
|
Xawotihs
|
a63991bb4e
|
Merge pull request #598 from bjornsnoen/master
Damager keyword
|
2013-12-31 09:11:20 -08:00 |
|
xawotihs
|
b09db0c60f
|
Removed c++11 warning.
|
2013-12-22 21:26:06 +01:00 |
|
Bjørn Snoen
|
928ca3497a
|
More code compliance. New tests.
|
2013-12-21 19:31:32 +01:00 |
|
Bjørn Snoen
|
60219411f6
|
Coding style compliance
|
2013-12-21 14:33:44 +01:00 |
|
Bjørn Snoen
|
642f5bb515
|
Fixed indentation mistakes
|
2013-12-21 11:18:18 +01:00 |
|
Bjørn Snoen
|
20e878a102
|
Made damager keyword work. Fixed Executioner's Swing in mtg.txt
|
2013-12-21 11:05:15 +01:00 |
|
xawotihs
|
da31371d86
|
Include c++11 threading
|
2013-12-20 18:39:02 +01:00 |
|
xawotihs
|
0df408793a
|
Tries to fix android sdk installation in Travis
|
2013-12-20 14:09:30 +01:00 |
|
xawotihs
|
9630bcd56b
|
Removed file wrongly added.
|
2013-12-20 12:37:25 +01:00 |
|
xawotihs
|
3c38e21b25
|
Merge branch 'master' into Qt5.2_macx
|
2013-12-20 11:14:10 +01:00 |
|
xawotihs
|
caec886e22
|
Fixed issues found by XCode.
|
2013-12-20 00:24:08 +01:00 |
|
Dmitry Panin
|
927f8955e9
|
Merge pull request #596 from bjornsnoen/master
Fix a rarity mistake and a grammatical error
|
2013-12-19 02:44:38 -08:00 |
|
Bjørn Snoen
|
d4e0296d2b
|
Fixed wrong rarity on millstone in M14
|
2013-12-18 09:37:20 +01:00 |
|
Bjørn Snoen
|
8eb664f93d
|
Fixed grammatical then/than error.
|
2013-12-18 05:50:30 +01:00 |
|
xawotihs
|
b180c3d1a7
|
Fixed Qt5 mingw32 build
|
2013-12-16 22:11:28 +01:00 |
|
Dmitry Panin
|
db9f18a644
|
Added _cards.dat for M14 (taken from forum)
|
2013-12-15 22:39:08 +04:00 |
|