stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-25 04:00:47 +00:00
Code Issues Projects Releases Packages Wiki Activity
5620 commits 173 branches 41 tags 295 MiB
Commit graph

5620 commits

This branch
This branch
All branches
Author SHA1 Message Date
mazmazz
4f9231b7a5 Fix orbiting Ideya bug, now player gets them back again on exit 2018-08-11 22:13:33 -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
mazmazz
a4e3f8cbcf NIGHTSDRONE visual element position syncing: XYZ and OBJECTFLIP 2018-08-11 21:38:44 -04:00
mazmazz
72b592888f Line fixes for visual element positioning 
# Conflicts:
#	src/p_mobj.c
 2018-08-11 20:50:53 -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
Monster Iestyn
51b8d6e01a Make "Tutorial" warp directly to MAPZ0 (not configurable yet) 2018-08-11 21:17:52 +01:00
mazmazz
2c4f9d4776 Don't need this line 2018-08-11 15:54:39 -04:00
mazmazz
c99258b2e2 Make Drone hitbox height and player Z alignment configurable 
* Default hitbox height is 80
* Drone Thing parameter sets height to multiples of 32
* Player aligns by default to bottom+24 of hitbox (offsetted)
* `MTF_OBJECTSPECIAL` aligns player to hitbox top
* `MTF_EXTRA` aligns to hitbox center
* `MTF_OBJECTSPECIAL|MTF_EXTRA` aligns to real bottom of hitbox
* Goalpost and sparkle Z alignment is changed to reflect configurableness
 2018-08-11 15:52:42 -04:00
Monster Iestyn
0b88c364bc 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
mazmazz
0fe41e06ff Remove A_OrbitNights additional input offset on current target Z, don't need it 2018-08-11 12:06:50 -04:00
mazmazz
c8dcb57e83 Remove ORBIDYA CENTER states, we don't need 'em 2018-08-11 12:06:17 -04:00
mazmazz
d0f0f475ce * Bounce Droneman within hitbox instead of floorz 
* Correct Droneman hiding so he always stays within hitbox even when invisible
 2018-08-11 02:03:44 -04:00
mazmazz
d1a8e0baa0 Scale player to Drone's scale on Nightserize, and reset scale on De-Nightserize 
* Also correct player's position to Z center of Drone hitbox on Nightserize
 2018-08-11 02:02:56 -04:00
mazmazz
480c4f890d player->oldscale var for pre-Nightserize scale 2018-08-11 00:49:28 -04:00
mazmazz
8154578fb6 Switch Ideya orbiting state to centered offset states when orbiting around Drone 2018-08-11 00:09:02 -04:00
mazmazz
b97037f644 A_OrbitNights height offset by target height implementation 2018-08-11 00:07:26 -04:00
mazmazz
c9c0219393 ORBITEM CENTER states for A_OrbitNights target height offset 2018-08-10 23:49:02 -04:00
mazmazz
7c0186bc97 Drone de-coupling implementation 
* Visual elements and hitbox work as expected with scaling and OBJECTFLIP
 2018-08-10 22:11:48 -04:00
mazmazz
32c17b1454 Basic implementation for player position correction to Drone center 
* player->drone mobj variable
* P_MoveNiGHTSToDrone, will change later
 2018-08-10 19:25:49 -04:00
Steel Titanium
d9c7334dea Fix white being treated as transparent. 2018-08-10 19:02:03 -04:00
mazmazz
e0e77d873b Nights Drone mobj and state entries 
* New entries: NIGHTSDRONE_MAN, NIGHTSDRONE_SPARKLING
* NIGHTSGOAL renamed to NIGHTSDRONE_GOAL
* MT_NIGHTSDRONE repurposed as an invisble, no-gravity hitbox
 2018-08-10 18:24:31 -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