walkero
/
tbftss
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
798 Commits 3 Branches 28 Tags 100 MiB
Commit Graph

158 Commits

Author SHA1 Message Date
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 29d873d28a Allow waypoints to be manually activated. Removed entId from Battle (redundant). 2016-04-04 11:23:32 +01:00
Steve f9d02696fd Added mines destroyed stat. 2016-04-03 08:37:09 +01:00
Steve 4a1958319c Don't use quadtree for drawing. 2016-04-02 16:37:49 +01:00
Steve a64b41f851 Allow challenges to be completed even if the player is killed. 2016-04-02 09:37:39 +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 26ed8dc322 Allow side to be set for entities (mostly applies to mines). 2016-04-01 14:21:11 +01:00
Steve 3646a9326a Start of mines. 2016-03-30 07:22:58 +01:00
Steve 147f2afae4 Merge branch 'trophies' of ssh://github.com/stephenjsweeney/tbftss into trophies 
Conflicts:
	locale/tbftss.pot
	src/battle/battle.c
	src/battle/battle.h
	src/galaxy/mission.c
 2016-03-27 11:25:50 +01:00
Steve e278374490 Merge from develop. 2016-03-27 11:21:23 +01:00
Steve c00c134b70 Allow access to all missions when using -debug. 2016-03-27 11:08:44 +01:00
Steve 175b7e5ca0 Moved entity loading code out of mission.c, and into appropriate c files. 2016-03-17 08:11:52 +00:00
Steve 1b43e4908c Added ability to hide objective numbers. 2016-03-16 19:24:41 +00:00
Steve 4ef796bf92 Added id to objective, to allow script to function in non-English languages. 2016-03-16 06:54:34 +00:00
Sweeney 1938c6714c Merge remote-tracking branch 'origin/develop' into trophies 
# Conflicts:
#	data/challenges/10.json
#	locale/tbftss.pot
#	src/battle/battle.c
#	src/battle/battle.h
#	src/battle/script.h
#	src/galaxy/mission.c
 2016-03-15 12:19:32 +00:00
Steve 634d914bd9 Jumpgate initial state fix. 2016-03-14 11:28:19 +00:00
Steve edc18579ec Added support for spawners. 2016-03-14 11:12: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 71b0a00689 Use EF_DISABLED for jumpgates, rather than systemPower. 2016-03-12 12:35:05 +00:00
Steve ae6e2ede09 Control waypoints from script. 2016-03-12 12:09:42 +00:00
Steve 4f27b40d97 Added rescue challenges 2016-03-11 23:45:47 +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 8017719239 Allow fighters to be added to mission in disabled state. 2016-03-09 23:21:28 +00:00
Steve 25101c0f1d Now automatically checking trophies based on star system name. 2016-03-09 15:54:25 +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 7118c10648 Draw jumpgate portal in jumpgate.c. Use systemPower instead of ALIVE_SLEEPING to determine status. 2016-03-08 14:28:11 +00:00
Steve 22b5267ffd Initially add all entities to quadtree, to avoid the popping effect. 2016-03-08 07:12:06 +00:00
Steve 99013a4e99 Allow jumpgate to be put into "sleep" state: effectively inactive. 2016-03-08 06:55: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 244e5d6dd9 Merge from Master. 2016-03-06 19:07:43 +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 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 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 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 cb34b3b9b6 Maximum of 3 challenges per challenge mission. 2016-03-02 23:20:37 +00:00
Steve 2c71b16e17 Show and apply challenge restrictions. 2016-03-02 22:19:26 +00:00
Steve 0c31b2204c Refactored challenge data, for display on Challenge Home. 2016-03-02 06:46:13 +00:00