Steve
|
50883125e1
|
Merge.
|
2016-05-15 08:19:26 +01:00 |
|
Steve
|
0eaeaba386
|
Disabling trophies for now. Will activate in v0.7 or later.
|
2016-04-04 11:40:13 +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
|
721ca3e110
|
Trophy updates.
|
2016-03-06 17:13:34 +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 |