stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-17 16:30:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
4672 commits 175 branches 41 tags 272 MiB
Commit graph

4672 commits

This branch
This branch
All branches
Author SHA1 Message Date
mazmazz
89f57cb111 Have just one NiGHTS bonus option: NIGHTS and LINK together 2018-08-12 20:25:35 -04:00
mazmazz
fcd6b16646 Make lap bonus more valuable 2018-08-12 20:08:40 -04:00
mazmazz
30fa526f6f Merge branch 'nightsplus-laplogic' into nights-score-lap 2018-08-12 19:59:58 -04:00
mazmazz
0c8e2ffd78 Totalmarescore typo 2018-08-12 19:59:41 -04:00
mazmazz
ec8d264029 totalmarescore player variable for NiGHTS scoring 
# Conflicts:
#	src/p_setup.c
 2018-08-12 19:59:34 -04:00
mazmazz
5938a57970 totalmarelap and totalmarebonuslap player variables 2018-08-12 19:57:33 -04:00
mazmazz
fe904b0eb2 NiGHTS lap score bonus 2018-08-12 19:48:45 -04:00
mazmazz
0c0a403bb3 Merge branch 'nightsplus-laplogic' into nights-score-lap 
# Conflicts:
#	src/p_setup.c
 2018-08-12 19:39:31 -04:00
mazmazz
feadcbfc94 BONUSTYPE typo; bonus alignment 2018-08-12 19:32:11 -04:00
mazmazz
372fc540bc Totalmarescore typo 2018-08-12 19:26:18 -04:00
mazmazz
30d57eac79 NiGHTS bonus implementation 2018-08-12 19:25:21 -04:00
mazmazz
61999100e5 totalmarescore player variable for NiGHTS scoring 2018-08-12 19:21:55 -04:00
mazmazz
4e02171c23 Add lapbegunat and lapstartedtime player variables 
There is no lapfinishedtime because [mare]finishedtime refers to when Egg Capsule is destroyed. That concept does not apply to laps.
 2018-08-12 14:21:26 -04:00
mazmazz
02d5e4e902 MT_FLICKY_CENTER flag adjustments 2018-08-12 12:49:23 -04:00
mazmazz
2f6c0d7e4e Make Flicky color, move direction, and flags configurable by A_FlickyCenter var1 2018-08-12 09:23:50 -04:00
Nev3r
f19b7bfacf Merge branch 'horizon-line-hom-fix' into 'master' 
Horizon line HOM fix

See merge request STJr/SRB2Internal!152
 2018-08-12 03:48:20 -04:00
mazmazz
f4a813891f Decouple Flicky Thing logic from spawnpoint variables; use mobj variables 2018-08-12 02:34:37 -04:00
Alam Ed Arias
01a023206f Merge branch 'master' into XPMupdate 2018-08-11 21:59:39 -04:00
Alam Ed Arias
7d3e4f729f TravisCI: also remove gcc-6 2018-08-11 21:59:08 -04:00
Alam Ed Arias
b5cc11f7d8 TravisCI: gcc-4.9 is also gone 2018-08-11 21:44:07 -04:00
Alam Ed Arias
bb94d9fa3a Merge branch 'master' into XPMupdate 2018-08-11 20:37:34 -04:00
Alam Ed Arias
6603f26772 Merge branch 'xpm_fix' into 'XPMupdate' 
Fix white being treated as transparent.

See merge request STJr/SRB2!266
 2018-08-11 20:36:57 -04:00
Steel Titanium
d9c7334dea Fix white being treated as transparent. 2018-08-10 19:02:03 -04:00
mazmazz
c72e724122 Merge branch 'nightsplus-laplogic' into nightsplus-le 
# Conflicts:
#	src/p_map.c
#	src/p_setup.c
 2018-08-10 17:24:12 -04:00
Alam Ed Arias
0575d2f1f9 TravisCI: remove gcc-5 test, gcc-5 package is gone 2018-08-10 17:16:26 -04:00
mazmazz
872761e258 Add lapbegunat and lapstartedtime player variables 
There is no lapfinishedtime because [mare]finishedtime refers to when Egg Capsule is destroyed. That concept does not apply to laps.
 2018-08-10 17:12:26 -04:00
Alam Ed Arias
3479310546 SDL: update IMG_xpm.c 2018-08-10 17:09:11 -04:00
mazmazz
18b5b70822 Add lastmarelap and lastmarebonuslap player variables 2018-08-10 16:30:49 -04:00
mazmazz
d58445fdf3 Set player->finishedrings upon new mare 
(Forgot this line from the player->spheres merge, so let's straggle here)
 2018-08-10 16:17:28 -04:00
mazmazz
f69f102531 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nightsplus-le 
# Conflicts:
#	src/p_map.c
#	src/p_setup.c
 2018-08-10 15:51:20 -04:00
Monster Iestyn
30e4d2cd51 Merge branch 'polyobj-sky-plane-crash-fix' into 'master' 
Polyobject sky plane crash fix

See merge request STJr/SRB2Internal!146
 2018-08-10 15:40:43 -04:00
Monster Iestyn
299337f578 Merge branch 'leveltitle-tinkering' into 'master' 
Leveltitle tinkering

See merge request STJr/SRB2Internal!134
 2018-08-10 15:30:26 -04:00
mazmazz
1b922b8ba5 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nightsplus-laplogic 
# Conflicts:
#	src/p_map.c
#	src/p_setup.c
 2018-08-10 15:10:26 -04:00
Monster Iestyn
a5510cab5d Merge branch 'master' into polyobj-sky-plane-crash-fix 2018-08-10 20:06:12 +01:00
Monster Iestyn
8d0a44899a Merge branch 'master' into change-colormap-ldef 2018-08-10 20:05:04 +01:00
Monster Iestyn
d7830dfff4 Merge branch 'master' into horizon-line-hom-fix 2018-08-10 20:04:39 +01:00
mazmazz
7f4e2a6164 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into op-nightshoop 2018-08-10 15:04:14 -04:00
Monster Iestyn
55fd60b29b Merge branch 'master' into leveltitle-tinkering 
# Conflicts:
#	src/hu_stuff.h
 2018-08-10 20:03:59 +01:00
mazmazz
b8eb282367 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into le-fadefof-remove-storedthinker 2018-08-10 15:03:07 -04:00
mazmazz
508e1a2595 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into le-fadefof 2018-08-10 15:02:43 -04:00
mazmazz
d405bdfd9b Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nights-inufixes 2018-08-10 15:00:41 -04:00
mazmazz
07c882139b Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into flicky-things 2018-08-10 14:58:27 -04:00
Monster Iestyn
fa382c0233 Merge branch 'public_next' 2018-08-10 19:36:51 +01:00
Monster Iestyn
7ee9c5b0f4 Merge branch 'master' into next 2018-08-10 19:31:15 +01:00
Monster Iestyn
653fd3038d Merge branch 'woops!_all_trans' into 'master' 
Woops! All trans

See merge request STJr/SRB2!265
 2018-08-10 14:27:45 -04:00
Digiku
a439dce584 Merge branch 'hardcoding-nights-spheredamage' into 'master' 
NiGHTS: Handle sphere damage correctly upon timeout
* Spill spheres/chips, implement MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP
* Handle player->spheres and player->rings consistently

See merge request STJr/SRB2Internal!157
 2018-08-10 13:50:57 -04:00
Digiku
ed99f3a425 Merge branch 'nights-invertloopfix' into 'master' 
NiGHTS fix lap detection on inverted axis

See merge request STJr/SRB2Internal!138
 2018-08-10 13:49:42 -04:00
mazmazz
d97c25f6dd Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nightsplus-le 
# Conflicts:
#	src/p_setup.c
#	src/p_user.c
 2018-08-10 13:44:47 -04:00
mazmazz
487c62fe31 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nightsplus-laplogic 
# Conflicts:
#	src/p_setup.c
 2018-08-10 13:35:59 -04:00
mazmazz
672e196aa4 Pandora's Box support for player->spheres 
Opting to handle this transparently via the Rings menu option. Doesn't seem worth making a separate entry for Spheres.
 2018-08-10 13:15:54 -04:00