Steve
|
5e1220b9a4
|
Merge branch 'develop' into trophies
Conflicts:
src/battle/bullets.c
src/battle/bullets.h
src/battle/fighters.c
|
2016-04-04 11:30:27 +01:00 |
|
Steve
|
c4d9fae84c
|
Removed \n from logging.
|
2016-04-04 11:25:09 +01:00 |
|
Steve
|
77da136e75
|
Time limit warning for challenges.
|
2016-04-03 14:04:56 +01:00 |
|
Steve
|
f9d02696fd
|
Added mines destroyed stat.
|
2016-04-03 08:37:09 +01:00 |
|
Steve
|
28eec0b8e0
|
Merge branch 'develop' into trophies
Conflicts:
README.md
src/defs.h
src/galaxy/mission.c
src/system/sound.c
|
2016-04-01 17:14:06 +01:00 |
|
Steve
|
d178134a00
|
Allow AI to drop mines.
|
2016-04-01 14:19:03 +01:00 |
|
Steve
|
3bf73b5d70
|
Updates to mines.
|
2016-04-01 10:49:41 +01:00 |
|
Steve
|
3646a9326a
|
Start of mines.
|
2016-03-30 07:22:58 +01:00 |
|
Steve
|
52691f7be5
|
Enable AI flags to focus on targets.
|
2016-03-29 22:45:46 +01:00 |
|
Steve
|
c288fce12f
|
Windows build fixes.
|
2016-03-28 18:26:02 +01:00 |
|
Steve
|
f114ad7e7e
|
Merge branch 'develop' into trophies
|
2016-03-28 16:09:24 +01:00 |
|
Steve
|
45d9d2a00d
|
Don't show mission target boxes around capital ship components.
|
2016-03-28 11:45:48 +01:00 |
|
Steve
|
47f7f5671a
|
Added trophy graphics.
|
2016-03-27 11:32:38 +01:00 |
|
Steve
|
e278374490
|
Merge from develop.
|
2016-03-27 11:21:23 +01:00 |
|
Steve
|
06f7867013
|
Use CONTROL_NEXT_FIGHTER / CONTROL_PREV_FIGHTER to select fighters during epic missions.
|
2016-03-27 08:55:58 +01:00 |
|
Steve
|
09e676d713
|
Added simple die, to prevent swarmers spreading debris everywhere.
|
2016-03-16 06:53:07 +00:00 |
|
Steve
|
35b5e4a1c6
|
Misc cleanup.
|
2016-03-13 10:52:12 +00:00 |
|
Steve
|
7b0c70005f
|
Lookup updates.
|
2016-03-13 10:52:02 +00:00 |
|
Steve
|
675d051011
|
Tidied headers.
|
2016-03-12 18:29:22 +00:00 |
|
Steve
|
0a69dd0e5e
|
Merge from develop.
|
2016-03-12 18:22:48 +00:00 |
|
Steve
|
a5509b5bcd
|
Logging updates.
|
2016-03-12 15:12:52 +00:00 |
|
Steve
|
4f27b40d97
|
Added rescue challenges
|
2016-03-11 23:45:47 +00:00 |
|
Steve
|
3bd78dbd20
|
Spawn fighters offscreen or off map.
|
2016-03-11 23:45:12 +00:00 |
|
Steve
|
553178128f
|
InitStars during start up (lost during memory leak fixes).
|
2016-03-11 07:22:23 +00:00 |
|
Steve
|
7ba4dcf26c
|
Memory leak fixes.
|
2016-03-10 22:47:33 +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
|
46503f4fe7
|
Mark craft as stolen if they are moved to jumpgate by a vessel not on your side.
|
2016-03-09 23:20:50 +00:00 |
|
Steve
|
16c8f81389
|
Play sound effects for control config widgets.
|
2016-03-09 23:19:10 +00:00 |
|
Steve
|
f867e793bd
|
Trophy prototyping.
|
2016-03-09 11:51:26 +00:00 |
|
Steve
|
a74ff87a46
|
Added portal effect to jumpgate.
|
2016-03-07 22:50:41 +00:00 |
|
Steve
|
798135eadf
|
Don't allow rogue files to crash game at startup.
|
2016-03-07 19:03:55 +00:00 |
|
Steve
|
bc1c5d09a8
|
Replaced extraction point with jumpgate.
|
2016-03-07 17:12:21 +00:00 |
|
Steve
|
4a52bb1fce
|
Added item collection challenges.
|
2016-03-07 12:29:23 +00:00 |
|
Steve
|
fff301e3e2
|
Allow shrinking of array.
|
2016-03-06 09:48:29 +00:00 |
|
Steve
|
922b39c0ea
|
Challenge #8, defend extraction point. Added flag to allow AI to sometimes ignore extraction point.
|
2016-03-06 09:47:44 +00:00 |
|
Steve
|
e28390a496
|
Added array resize function (not using realloc because it doesn't zero the new array).
|
2016-03-05 23:56:21 +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
|
6dfb51e8b0
|
Allow keys and mouse buttons to be selected in options.
|
2016-03-05 12:35:19 +00:00 |
|
Steve
|
acd53f6b97
|
Further custom control integration.
|
2016-03-05 08:42:35 +00:00 |
|
Steve
|
7979b175a2
|
Waypoint challenge updates.
|
2016-03-04 22:59:16 +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
|
d2acbefc6d
|
Prevent modal dialog from being dismissed immediately.
|
2016-03-04 14:14:45 +00:00 |
|
Steve
|
95cb35d5a1
|
Added getJSONValue to aid with optional JSON data.
|
2016-03-04 14:14:04 +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
|
d5d5169078
|
Accuracy for rockets and missiles, not just shots.
|
2016-03-03 09:12:08 +00:00 |
|
Steve
|
2ca26b1ea0
|
Divide by zero check.
|
2016-03-03 07:47:33 +00:00 |