Sally Coolatta
337db54965
Missed this in p_setup.c
2020-08-06 17:55:36 -04:00
Sally Coolatta
b9886a166e
Merge p_setup.c
2020-08-06 11:42:16 -04:00
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
9933687c6e
Merge branch 'master' into pet-robo
2020-05-24 17:18:02 -04:00
Sryder
ad51b791d5
Fix software not contrasting properly to +-2
2020-05-21 18:11:38 +01:00
Sryder
8d34ca0533
Use a const for the contrast, and double it for extra impact.
2020-05-21 17:55:33 +01:00
Sryder
195920acdc
Update light offset on polyobjects when they rotate
2020-05-21 17:15:50 +01:00
Sryder
d4080e94f7
Better fake contrast.
...
Fake contrast for the segs are calculated at map load.
OpenGL only has the options "Standard" and "Smooth" now. Standard is default and replicates software. Smooth changes the contrast more smoothly depending on angle.
2020-05-21 16:32:34 +01:00
Sally Coolatta
0282615c38
Merge branch 'master' into pet-robo
2020-05-18 15:18:37 -04:00
MascaraSnake
ef85e7f99d
Polyobject waypoint movement: Prevent infinite loop if all waypoints are in the same location
2020-05-16 10:24:06 +02:00
Sal
4b8f46490e
Merge branch 'waypoint-helpers-tweaks' into 'master'
...
Fix Waypoint Anchors and split paths; DefaultWaypointRadius for your level headers!
See merge request KartKrew/Kart!254
2020-05-14 18:15:33 -04:00
Sally Coolatta
1788d29263
Merge branch 'master' into pet-robo
2020-05-12 22:38:23 -04:00
MascaraSnake
4c526f6e50
Store waypoints (for zoom tubes, rope hangs, polyobjects) explicitly
2020-05-12 23:50:30 +02:00
Sally Coolatta
15d18640de
Merge remote-tracking branch 'public/master' into merge-12
2020-05-12 03:16:14 -04:00
Sally Coolatta
f903ca960d
Not in modeattacking
2020-05-12 01:41:00 -04:00
Sally Coolatta
d2172fc54b
Bot amount & difficulty is now controlled by cvars
2020-05-07 02:37:06 -04:00
James R
7c9824dc56
Multiply the default radius of 384 by mobjscale, but not user set radiuses
2020-05-04 17:54:43 -07:00
James R
e2d4ddcec2
SOC: DefaultWaypointRadius in the level header picardy
2020-05-04 17:39:11 -07:00
MascaraSnake
2df5758ecf
Allow map-wide gravity to be set via level header
2020-05-03 18:33:18 +02:00
MascaraSnake
9abfcacc3c
Add level header options for setting special stage time and spheres requirements
2020-05-03 17:56:49 +02:00
MascaraSnake
8efec04051
Remove POLYOBJECTS and POLYOBJECTS_PLANES defines
2020-05-02 12:08:31 +02:00
Sally Cochenour
174a76f7e8
Merge branch 'master' into pet-robo
2020-04-28 21:10:16 -04:00
James R
4b2c13da0c
Merge remote-tracking branch 'origin/master' into fof-things-suck
2020-04-24 20:36:30 -07: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
20ec3f6c89
Merge branch 'emeraldspawnfix' into 'next'
...
Fix emerald hunt not working properly, part 2
See merge request STJr/SRB2!887
2020-04-23 15:41:27 -04:00
sphere
d5863b912f
Move variable declarations outside of for loops.
2020-04-22 23:17:18 +02:00
sphere
13c47b9e6f
Fix variable-length array definition, just in case.
2020-04-22 23:10:43 +02:00
sphere
b3b7ffb889
Make P_SpawnEmeraldHunt even more concise, using Fisher-Yates shuffle.
2020-04-22 22:46:12 +02:00
sphere
d7185516f5
Fix a mistake with P_SpawnEmeraldHunt and make it more concise.
2020-04-22 20:38:58 +02:00
sphere
0868930d3b
Make emerald hunt shards spawn at correct heights, and add Float option.
2020-04-22 18:58:40 +02:00
Ashnal
abc17c9448
Fix dedicated servers not waiting for client wipes.
...
Now they run wipe logic to wait the same amount of
time that clients do, without actually rendering anything.
Previously, the server would start the new map immediately,
and clients would frameskip up to the server when they were done wiping.
2020-04-21 19:16:31 -05:00
Louis-Antoine
74e8d7f733
Rename lumpinfo_t.name2 to lumpinfo_t.fullname
2020-04-20 23:40:41 +02:00
Sally Cochenour
96d69785bf
Merge branch 'master' into pet-robo
2020-04-18 01:18:22 -04:00
MascaraSnake
93eb0ee1c8
Add an enum for crumblestate
2020-04-17 23:54:37 +02:00
James R
0b3b13b3b5
Remove FOF height sorting
2020-04-15 19:16:49 -07:00
Nev3r
44426fd453
Actually remove the entire code block in T_MovePlane(), and remove line_t.tagline as it served no other purpose.
2020-04-13 15:17:53 +02:00
Wolfy
5e4ec61d82
Merge remote-tracking branch 'remotes/bird/isolatedbatching' into awful-mix
...
# Conflicts:
# src/hardware/hw_cache.c
# src/hardware/hw_draw.c
# src/hardware/hw_glob.h
# src/hardware/hw_main.c
# src/r_bsp.h
# src/r_data.c
2020-04-11 23:47:25 -05:00
James R
71f4433b98
Merge branch 'dye' into 'next'
...
Expose colorization to mappers and SOC
See merge request STJr/SRB2!679
2020-04-09 19:50:32 -04:00
James R
89a2f8ec8d
Thing type 2002, MT_WAYPOINT_RISER - Raise tagged waypoints in sector to FOF sorted by height
...
Thing height refers to the index of FOF. FOF are sorted by top height, lowest
to highest. Set Object Flip to sort highest to lowest.
If the waypoint thing set Object Flip, it will be placed on the bottom of the
FOF. The sorting remains the same though.
Set Ambush to raise the waypoint to the same z position.
2020-04-04 01:20:38 -07:00
James R
3fa22c508b
Put screenshots, movies and replays under a "media" directory
2020-03-30 17:41:48 -07:00
Sally Cochenour
751fd9ad1b
Start on bots, doesn't work
2020-03-27 23:51:49 -04:00
James R
abcba53781
Merge remote-tracking branch 'origin/master' into parties
2020-03-22 18:28:07 -07:00
James R
cbd4693de7
Merge remote-tracking branch 'origin/master' into parties
2020-03-22 14:34:29 -07:00
Sally Cochenour
b1ec5654bc
Merge branch 'master' into targets
2020-03-22 14:31:17 -04:00
Louis-Antoine
4e7605f0e2
Make SRB2 flat like Earth
2020-03-20 18:55:29 +01:00
Louis-Antoine
46df2b9551
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01:00
Sryder
c268313f0a
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
...
# Conflicts:
# src/Makefile
# src/k_kart.c
# src/p_map.c
# src/p_setup.c
# src/p_spec.c
2020-03-16 00:13:42 +00:00
Monster Iestyn
f3bfa2b1db
Merge branch 'master' into next
2020-03-15 20:32:43 +00:00
Latapostrophe
1f5bbb2c3d
Merge branch 'push-more-lua' into awful-mix
2020-03-11 07:37:47 +01:00
Latapostrophe
f98a74638f
More explicit var names for countdown and countdown2
2020-03-11 07:37:33 +01:00
