Sally Coolatta
63917ffccc
The start of the scary 2.2 merge
...
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
2020-05-29 13:43:38 -04:00
Sally Coolatta
edfc14c506
Better steering
...
- If they're already turning in one direction, they are more likely to steer in that direction for objects
- Bots have to want to turn in 1 direction for a few frames in a row before it'll let them
Prevents twitching & makes them less indecisive in general
2020-05-24 11:12:38 -04:00
SwitchKaze
58cac1fd73
Make colors UINT16, increase color freeslots to 1024
2020-05-23 19:35:36 -05:00
MascaraSnake
a928eb3cf7
Merge branch 'more-polyobject-cleanup' into 'next'
...
Smooth polyobject movement and other cleanup
See merge request STJr/SRB2!947
2020-05-18 16:00:55 -04:00
MascaraSnake
42e6d1a593
Merge branch 'fof-cleanup' into 'next'
...
FOF cleanup
See merge request STJr/SRB2!910
2020-05-17 02:30:16 -04:00
MascaraSnake
52e05bc8d5
T_PolyObjWaypoint: We can find waypoints in constant time now, so no need to store the waypoint mobj in the thinker anymore
2020-05-16 09:03:02 +02:00
MascaraSnake
93b6615e61
Store PolyObject waypoint return behavior in an enum
2020-05-13 16:21:47 +02:00
MascaraSnake
ea0176fada
Remove diffx/y/z from polywaypoint_t, since they're always 0 anyway
2020-05-13 14:40:07 +02:00
Sally Coolatta
1788d29263
Merge branch 'master' into pet-robo
2020-05-12 22:38:23 -04:00
Sally Coolatta
15d18640de
Merge remote-tracking branch 'public/master' into merge-12
2020-05-12 03:16:14 -04:00
MascaraSnake
8efec04051
Remove POLYOBJECTS and POLYOBJECTS_PLANES defines
2020-05-02 12:08:31 +02:00
MascaraSnake
58508e199d
Make the laser thinker find the FOF itself instead of storing it in the thinker struct
2020-05-02 10:03:16 +02:00
MascaraSnake
e967c32a10
Merge branch 'more-thinker-refactor' into 'next'
...
More thinker refactoring
See merge request STJr/SRB2!900
2020-05-01 05:47:14 -04:00
MascaraSnake
5cf3fd0074
Merge branch 'next' into elevator-cleanup
...
# Conflicts:
# src/p_saveg.c
2020-05-01 11:42:05 +02:00
MascaraSnake
2973b79715
Remove bogus comments from p_saveg.c
2020-05-01 11:25:32 +02:00
Monster Iestyn
edfbd799db
Merge branch 'next' into netarchive-cleanup
2020-04-29 15:27:07 +01:00
Monster Iestyn
0ab7d0b4b5
Don't discard const, added missing &
2020-04-29 15:24:28 +01:00
Monster Iestyn
5f3a827609
Whoops the third
2020-04-29 14:45:52 +01:00
MascaraSnake
398ee65646
Store "no bosses" setting for lasers in thinker instead of checking sourceline.
2020-04-27 13:09:57 +02:00
MascaraSnake
40d0fb714d
Store tag instead of sourceline in raise thinker
2020-04-27 12:54:08 +02:00
MascaraSnake
2d860cd362
Make new thinker loading functions set floordata/ceilingdata where necessary
2020-04-26 18:54:03 +02:00
MascaraSnake
bd40d8df9e
Remove obsolete stuff from elevator_t
2020-04-26 18:38:45 +02:00
MascaraSnake
5a3883648d
Accidentally changed the wrong SaveElevatorThinker call to SaveCrumbleThinker
2020-04-26 18:31:39 +02:00
MascaraSnake
38a3be00d0
T_StartCrumble refactoring, part 1
2020-04-26 16:51:14 +02:00
MascaraSnake
62ab099b6f
Make T_StartCrumble use its own thinker data structure
2020-04-26 11:55:10 +02:00
Monster Iestyn
d06d55e2ae
created P_GetFFloorID to get an "ID" of an FOF in its target sector (an opposite to P_GetFFloorByID you could say!), rewrote floor/ceiling rover archiving code to use both P_GetFFloorID and P_GetFFloorByID
2020-04-24 22:29:41 +01:00
Monster Iestyn
cc7185ef30
no diff3 needed for line archiving
2020-04-24 20:58:38 +01:00
Monster Iestyn
c06b4913eb
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
2020-04-24 20:57:48 +01:00
Monster Iestyn
ff944f5f94
split sector/lines archiving-related code into their own functions too
2020-04-24 20:40:50 +01:00
Monster Iestyn
d255d29942
remove statsec and statline as they appear to be entirely unused
2020-04-24 20:28:01 +01:00
Monster Iestyn
0916ca3642
Split off FOF archiving-related code into their own functions
2020-04-24 20:26:57 +01:00
Monster Iestyn
f26e8f3df7
Merge branch 'thinker-cleanup' into 'next'
...
Plane movement thinker cleanup
See merge request STJr/SRB2!880
2020-04-24 14:30:52 -04:00
Monster Iestyn
db9c14702d
These are flags! Serves me right for just rushing this out
2020-04-24 16:53:54 +01:00
Monster Iestyn
d1e49fa926
Sync crumblestate in netgames
2020-04-24 16:40:09 +01:00
James R
ccf1bdcb29
Put botvars in savegame
2020-04-20 22:09:49 -07:00
MascaraSnake
0d21e4ad87
Eradicate levelspecthink_t
2020-04-18 11:05:58 +02:00
MascaraSnake
1d35442e16
Make T_BounceCheese use its own thinker struct
2020-04-18 10:45:21 +02:00
MascaraSnake
54de7584d1
Refactor T_ThwompSector
2020-04-18 10:26:03 +02:00
MascaraSnake
71f9fe167b
Refactor T_NoEnemiesSector
2020-04-18 09:21:04 +02:00
MascaraSnake
a90735fdf0
Make T_MarioBlock use its own thinker data structure
2020-04-18 02:05:23 +02:00
MascaraSnake
e6193297d8
Refactor T_ContinuousFalling
2020-04-18 01:42:13 +02:00
MascaraSnake
272a8e532b
Refactor T_FloatSector
2020-04-18 00:26:49 +02:00
MascaraSnake
3add9943a8
Remove the spike thinker, which hasn't been necessary for a while now
2020-04-17 22:54:35 +02:00
MascaraSnake
21b92b63e9
Make T_EachTimeThinker use its own struct
2020-04-17 14:00:48 +02:00
MascaraSnake
1f038e827a
-Remove superfluous variables from raise_t
...
-Cleanup signatures of P_AddRaiseThinker and P_AddAirbob
2020-04-17 11:11:36 +02:00
MascaraSnake
cd036b57fd
Make T_RaiseSector use its own thinker struct instead of levelspecthink_t
2020-04-17 09:58:53 +02:00
Nev3r
d05ad892be
Remove the bridge thinker code.
2020-04-14 10:31:07 +02:00
James R
e8ca96ceb4
Merge remote-tracking branch 'origin/master' into HEAD
2020-04-01 19:41:44 -07:00
Sryder
956222ad86
Fix joining netgames not loading up waypoints correctly.
...
Mobjs get deleted and loaded from net save. The mobjs in the waypoints need to load into the correct waypoints again.
This doesn't save/load the entire waypoints, so they still cannot be edited/added/removed mid-game.
2020-03-30 20:43:01 +01:00
Sally Cochenour
751fd9ad1b
Start on bots, doesn't work
2020-03-27 23:51:49 -04:00
