Steve
|
86ed4678e2
|
Misc clean up.
|
2016-04-02 16:38:26 +01:00 |
|
Steve
|
f114ad7e7e
|
Merge branch 'develop' into trophies
|
2016-03-28 16:09:24 +01:00 |
|
Steve
|
ab8be196b5
|
Khepri now green and associated with rogue nation.
|
2016-03-28 11:47:11 +01:00 |
|
Steve
|
e278374490
|
Merge from develop.
|
2016-03-27 11:21:23 +01:00 |
|
Steve
|
f5b3933a87
|
Merge branch 'develop' into trophies
Conflicts:
src/battle/battle.c
|
2016-03-12 18:28:43 +00:00 |
|
Steve
|
da97818259
|
Trophy-related prototyping fixes.
|
2016-03-10 18:02:19 +00:00 |
|
Steve
|
e8d63df494
|
Merge remote-tracking branch 'origin/develop' into trophies
# Conflicts:
# src/battle/battle.c
# src/challenges/challengeHome.c
|
2016-03-10 12:04:04 +00:00 |
|
Steve
|
ba5260104a
|
Check trophies at start of galactic map.
|
2016-03-09 15:53:56 +00:00 |
|
Steve
|
93dd00c785
|
Prototyping stats trophies.
|
2016-03-09 12:31:33 +00:00 |
|
Steve
|
f867e793bd
|
Trophy prototyping.
|
2016-03-09 11:51:26 +00:00 |
|
Steve
|
ecdf9998d0
|
Don't select options widget.
|
2016-03-07 19:04:12 +00:00 |
|
Steve
|
721ca3e110
|
Trophy updates.
|
2016-03-06 17:13:34 +00:00 |
|
Steve
|
ac59559d90
|
Clear input when pressing Escape.
|
2016-03-05 15:35:09 +00:00 |
|
Steve
|
f55a4e57c8
|
Pressing ESCAPE blocks when awaiting widget input.
|
2016-03-05 13:49:07 +00:00 |
|
Steve
|
d2a234839b
|
Integrated mouse control mappings.
|
2016-03-05 13:21:17 +00:00 |
|
Steve
|
acd53f6b97
|
Further custom control integration.
|
2016-03-05 08:42:35 +00:00 |
|
Steve
|
599c4fc338
|
Merge fixes.
|
2016-03-04 22:11:13 +00:00 |
|
Steve
|
159d36017b
|
Centralizing getFileLocation() to make file loading more transparent.
|
2016-03-04 14:29:50 +00:00 |
|
Steve
|
b6012a2e21
|
Merged config branch.
|
2016-03-03 18:03:07 +00:00 |
|
Steve
|
c8dd06dcdc
|
Added AUTO option for music. Reorganised music for easier scanning.
|
2016-03-03 16:16:12 +00:00 |
|
Steve
|
05185950e4
|
Auto select first challenge when coming from title.
|
2016-03-02 22:24:59 +00:00 |
|
Steve
|
1c270888aa
|
Removed mouse warping. Is too jarring.
|
2016-02-29 16:05:35 +00:00 |
|
Steve
|
9b6abf764a
|
Percent complete stats updates.
|
2016-02-29 10:47:10 +00:00 |
|
Steve
|
0e159402e9
|
Show stats button on title screen.
|
2016-02-29 09:35:39 +00:00 |
|
Steve
|
211df6d8ec
|
i18n updates.
|
2016-02-28 13:45:17 +00:00 |
|
Steve
|
660bb57bb0
|
Further challenge updates.
|
2016-02-27 18:12:18 +00:00 |
|
Steve
|
2e5b45064a
|
Challenges integration.
|
2016-02-27 16:16:21 +00:00 |
|
Steve
|
266088f764
|
Start of restoring challenges.
|
2016-02-27 12:14:29 +00:00 |
|
Steve
|
3f100a0848
|
Init effects on title screen, to prevent crash.
|
2016-02-25 12:26:54 +00:00 |
|
Steve
|
a7f9585a9a
|
Moved prepareScene / presentScene into main loop.
|
2016-02-22 17:27:36 +00:00 |
|
Steve
|
cedbed4dc8
|
Updated copyright dates.
|
2016-02-21 15:50:27 +00:00 |
|
Steve
|
d6982e80ca
|
Created common.h to aid with cross compiling.
|
2015-12-05 08:15:58 +00:00 |
|
Steve
|
95e26f3e7b
|
Start of mouse control integration.
|
2015-11-23 14:52:11 +00:00 |
|
Steve
|
2ad6579a35
|
Added revision number to build.
|
2015-11-14 14:45:19 +00:00 |
|
Steve
|
9debf3be56
|
Set camera to 0,0 on title, to ensure effects appear in the correct places.
|
2015-11-01 16:11:38 +00:00 |
|
Steve
|
443723f6b7
|
Implemented camera, to aid fighter switching. Added prompts for switching fighters, when current one is destroyed.
|
2015-10-31 23:09:43 +00:00 |
|
Steve
|
c506ad32cf
|
Make missiles more powerful. Save name of last mission star system.
|
2015-10-30 07:22:49 +00:00 |
|
Steve
|
705a2cebe9
|
Removed Fighter struct and replaced with Entity.
|
2015-10-26 19:16:12 +00:00 |
|
Steve
|
c322cced55
|
Improved stats processing. Added pages to stats screen.
|
2015-10-25 00:01:46 +01:00 |
|
Steve
|
10c72dc5fd
|
Updated version info.
|
2015-10-20 18:13:54 +01:00 |
|
Steve
|
834e03c531
|
Continue is default widget on title if save file exists.
|
2015-10-20 13:45:28 +01:00 |
|
Steve
|
24bf15ce09
|
Initial check in to GitHub.
|
2015-10-20 12:51:49 +01:00 |