Monster Iestyn
|
fa637475ae
|
Hardcoded Brambles.lua from CEZRes.pk3, changed thing type to 1125
|
2018-08-22 17:16:11 +01:00 |
|
Monster Iestyn
|
0d4fba77a6
|
Merge branch 'master' into tutorial-time
|
2018-08-21 15:41:35 +01:00 |
|
Monster Iestyn
|
3cce0b8a33
|
Merge branch 'public_next'
# Conflicts:
# src/sdl12/i_cdmus.c
# src/win32ce/win_cd.c
|
2018-08-21 15:40:54 +01:00 |
|
Monster Iestyn
|
36080cc49a
|
Merge branch 'master' into next
|
2018-08-21 15:36:36 +01:00 |
|
Monster Iestyn
|
eb5b5300ab
|
Merge branch 'XPMupdate' into 'master'
update XPM icon
See merge request STJr/SRB2!267
|
2018-08-21 10:31:25 -04:00 |
|
Monster Iestyn
|
9639c510a4
|
Merge branch 'defaultsoundvol' into 'master'
Change default sound volume
See merge request STJr/SRB2!238
|
2018-08-20 09:41:04 -04:00 |
|
Digiku
|
20bb759ff6
|
Remove unnecessary totalring deduction condition
Because it would be triggered by !(maptol & TOL_NIGHTS) in the old code anyway
|
2018-08-17 09:11:59 -04:00 |
|
Digiku
|
9b0e9a58fe
|
Revert "Checkpoint (unfinished): player->totalsphere"
This reverts commit 4aade072ef
|
2018-08-17 09:09:10 -04:00 |
|
mazmazz
|
6dd64bccbc
|
Place backwards Bumpers with the correct Thing angle
|
2018-08-16 22:07:53 -04:00 |
|
Monster Iestyn
|
004fd77b41
|
Merge branch 'master' into next
|
2018-08-16 22:04:00 +01:00 |
|
Monster Iestyn
|
0792e78254
|
Merge branch 'lua-sector-names-fix' into 'next'
Lua sector names fix
See merge request STJr/SRB2!263
|
2018-08-16 16:57:41 -04:00 |
|
Monster Iestyn
|
6797976531
|
Merge branch 'sdl_mixer_fixes' into 'master'
SDL Mixer fixes
Closes #31
See merge request STJr/SRB2!260
|
2018-08-16 16:57:14 -04:00 |
|
mazmazz
|
5fdece424a
|
Adjust vertical angle and forwards/backwards of NiGHTS bumper in objectplace
|
2018-08-16 16:51:48 -04:00 |
|
mazmazz
|
4aade072ef
|
Checkpoint (unfinished): player->totalsphere
|
2018-08-16 13:11:32 -04:00 |
|
mazmazz
|
32939a11f1
|
Change SETRINGS to support player->spheres in NiGHTS
|
2018-08-16 12:13:57 -04:00 |
|
mazmazz
|
ed9e74c15a
|
Line from revert
|
2018-08-16 11:35:35 -04:00 |
|
mazmazz
|
4b8fd01bc0
|
Revert "SETSPHERES console command for debugging/cheating"
This reverts commit 9e8784a376.
|
2018-08-16 11:34:57 -04:00 |
|
mazmazz
|
675ed7ecf0
|
Don't apply autobrake on NiGHTS bumpers
|
2018-08-15 23:40:42 -04:00 |
|
mazmazz
|
baa4c30e99
|
Also center non-NiGHTS players on NiGHTS bumpers
|
2018-08-15 19:09:54 -04:00 |
|
mazmazz
|
6010822c84
|
Use more efficient position setting. For Z, also adjust for bumper mobj scale.
|
2018-08-15 18:50:28 -04:00 |
|
mazmazz
|
1381ffc3e6
|
Fix NiGHTS Bumper player positioning
|
2018-08-15 18:42:20 -04:00 |
|
mazmazz
|
a49aa9babe
|
Fix bonus time quirk where lines are run if player->marebonuslap is 0
* Bonus laps start at 1, so if a line is looking for bonus laps, they should only be run at >= 1.
|
2018-08-14 16:08:21 -04:00 |
|
mazmazz
|
6ba6454056
|
Comments
|
2018-08-14 14:57:58 -04:00 |
|
mazmazz
|
9452c02ca1
|
Fix Capsule Entrance exec firing repeatedly
|
2018-08-14 12:48:00 -04:00 |
|
mazmazz
|
b1368078c6
|
Make Bonus Time Start executor into a general Egg Capsule Touch executor
* Entrance/exit flags
* Enough/not-enough-rings flags (with "doesn't matter" line option)
|
2018-08-14 12:00:37 -04:00 |
|
mazmazz
|
35bcf200be
|
Alternate take on pre-blowup: Do it on first touching tic, instead of first ring pop
* Use MT_EGGCAPSULE extravalue2 for tic timer
|
2018-08-14 11:41:10 -04:00 |
|
mazmazz
|
3a3976bd71
|
Make LE Ring triggers accept spheres for NiGHTS levels
|
2018-08-14 11:10:10 -04:00 |
|
mazmazz
|
e399d08d76
|
Add ML_BOUNCY flag to Bonus Time executor to execute BEFORE the capsule is destroyed and player has enough spheres
|
2018-08-14 10:48:50 -04:00 |
|
mazmazz
|
53303174c1
|
MaxBonusLives level header option for # of lives in score tally
|
2018-08-13 14:17:38 -04:00 |
|
mazmazz
|
c89e48e23c
|
Fix attraction bug on non-NiGHTS and Nightopian Helper
* Switch from mo->movecount to mo->movefactor for type compat
* Adjust timings for regular and paraloop attraction
|
2018-08-12 23:03:12 -04:00 |
|
mazmazz
|
5b61de544c
|
Merge nightsplus-laplogic
|
2018-08-12 21:20:14 -04:00 |
|
mazmazz
|
921b50550a
|
Totalmarescore typo
|
2018-08-12 19:59:41 -04:00 |
|
mazmazz
|
d24de8bc2f
|
totalmarescore player variable for NiGHTS scoring
# Conflicts:
# src/p_setup.c
|
2018-08-12 19:59:34 -04:00 |
|
mazmazz
|
9a9a2d94cc
|
totalmarelap and totalmarebonuslap player variables
|
2018-08-12 19:57:33 -04:00 |
|
mazmazz
|
269c1a70ba
|
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 |
|
Monster Iestyn
|
f31dcb6357
|
Added "Tutorialmap" MainCfg option for SOC
|
2018-08-12 14:30:49 +01:00 |
|
Nev3r
|
effd0ebe97
|
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 |
|
Alam Ed Arias
|
e7eaba0118
|
Merge branch 'master' into XPMupdate
|
2018-08-11 21:59:39 -04:00 |
|
Alam Ed Arias
|
ca8de769a8
|
TravisCI: also remove gcc-6
|
2018-08-11 21:59:08 -04:00 |
|
Alam Ed Arias
|
5b5013c9b1
|
TravisCI: gcc-4.9 is also gone
|
2018-08-11 21:44:07 -04:00 |
|
Alam Ed Arias
|
e4317066a6
|
Merge branch 'master' into XPMupdate
|
2018-08-11 20:37:34 -04:00 |
|
Alam Ed Arias
|
e7ec2e3830
|
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 |
|
Monster Iestyn
|
4ab0742604
|
Make "Tutorial" warp directly to MAPZ0 (not configurable yet)
|
2018-08-11 21:17:52 +01:00 |
|
Monster Iestyn
|
5534c0519c
|
Add "Tutorial" to the 1P menu, above "Start Game". It doesn't actually do anything yet, mind!
Also, change said menu's def to start at "Start Game" when entering it for the first time.
|
2018-08-11 18:01:54 +01:00 |
|
Steel Titanium
|
cd790eca91
|
Fix white being treated as transparent.
|
2018-08-10 19:02:03 -04:00 |
|
mazmazz
|
a3946ee154
|
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
|
e04d13f647
|
TravisCI: remove gcc-5 test, gcc-5 package is gone
|
2018-08-10 17:16:26 -04:00 |
|
mazmazz
|
70c99ed669
|
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
|
8f6d20d53c
|
SDL: update IMG_xpm.c
|
2018-08-10 17:09:11 -04:00 |
|
mazmazz
|
2f5186d014
|
Add lastmarelap and lastmarebonuslap player variables
|
2018-08-10 16:30:49 -04:00 |
|