Commit graph

11283 commits

Author SHA1 Message Date
Jaime Passos
9c66740e2b AA trees are not needed at all for rotated patches 2020-01-07 16:10:38 -03:00
Jaime Passos
3b29ec3fbc Merge remote-tracking branch 'origin/next' into pictureformats 2020-01-07 16:10:25 -03:00
Jaime Passos
679eb3902f How did I even manage to do this? 2020-01-07 14:12:19 -03:00
Jaime Passos
769c1a4e38 Fix OpenGL 2020-01-07 14:07:14 -03:00
Jaime Passos
e2d0ddfb54 R_GetTextureFlat -> R_GetLevelFlat 2020-01-07 13:27:59 -03:00
Jaime Passos
82998100d3 Move location of R_CheckPowersOfTwo and R_CheckFlatLength 2020-01-07 12:46:46 -03:00
Jaime Passos
fb0d9cdede Move location of R_GetTextureFlat 2020-01-07 12:45:22 -03:00
Jaime Passos
b6ced0884e Organise header files, use R_GetFlat 2020-01-07 12:43:27 -03:00
Jaime Passos
96340ac80c Move texture stuff to its own file 2020-01-07 12:35:10 -03:00
Sally Cochenour
d2e3c832da Merge next 2020-01-07 07:35:39 -05:00
lachwright
1811a2a34d Dashmode tweaks:
- Remove the ability for non-SF_MACHINE players in dashmode to break spikes and monitors
- Replace instances of dashmode magic numbers with dashmode constants
- Add dashmode constants to dehacked.c
2020-01-07 15:38:48 +08:00
James R
9804e15e6f Merge branch 'amyhearts-fix' into 'next'
Fix NPC Amy's love hearts crashing if they didn't have a set fuse

See merge request STJr/SRB2!641
2020-01-07 01:05:09 -05:00
lachwright
58d1bcf984 Apply skin's highresscale to continue screen 2020-01-07 13:56:54 +08:00
Tatsuru
30683f5bdd ifdefs make indenting confusing 2020-01-07 01:24:04 -03:00
Jaime Passos
d18b0dcde8 How did I mess this up? 2020-01-06 22:08:51 -03:00
Jaime Passos
d9b64c14c6 Missing check 2020-01-06 21:16:33 -03:00
Jaime Passos
a24607a452 Don't force 16bpp if the bit depth was already higher! 2020-01-06 21:02:25 -03:00
Jaime Passos
fd2340d802 Make error messages consistent 2020-01-06 20:42:46 -03:00
Jaime Passos
c4e082d56e Fix patch conversion 2020-01-06 20:39:38 -03:00
Jaime Passos
66dedc3730 Initialise 2020-01-06 20:20:05 -03:00
Jaime Passos
385a6cf3c3 Cleanup, NOW 2020-01-06 20:16:48 -03:00
Steel Titanium
9a48bc65ec Update copyright statements for changed names 2020-01-06 17:16:27 -05:00
MascaraSnake
23cb950ff4 Merge branch 'udmf-next' into linedef-args 2020-01-06 23:10:53 +01:00
MascaraSnake
36183e0455 Merge branch 'ignore-glsegs' into 'next'
Add missing glseg checks (and remove a superfluous one)

See merge request STJr/SRB2!642
2020-01-06 17:08:32 -05:00
Jaime Passos
bc096d35bb Fix warnings 2020-01-06 18:31:08 -03:00
Jaime Passos
4e0810e8a3 Picture formats test 2020-01-06 18:22:23 -03:00
MascaraSnake
2f80899db9 Add slope linedefs to UDMF ZB config 2020-01-06 20:45:02 +01:00
MascaraSnake
3615031636 Merge branch 'linedef-args' of git.magicalgirl.moe:STJr/SRB2 into linedef-args 2020-01-06 17:41:30 +01:00
MascaraSnake
d55a64b740 Adapt setup of copy slope linedef to UDMF 2020-01-06 17:39:39 +01:00
Alam Ed Arias
06849fed6b Merge branch 'master' into next 2020-01-06 10:28:21 -05:00
Alam Ed Arias
617fd1f7e0 Merge branch 'ignore-glsegs' into linedef-args 2020-01-06 09:59:16 -05:00
Alam Ed Arias
ca130c4313 idented hell 2020-01-06 09:58:05 -05:00
MascaraSnake
7e6ac2ac92 Adapt setup of vertex-based slopes to UDMF 2020-01-06 15:34:28 +01:00
MascaraSnake
4d8275ab1d Merge branch 'ignore-glsegs' into linedef-args 2020-01-06 15:14:43 +01:00
MascaraSnake
64dc6659c5 Merge branch 'next' into linedef-args 2020-01-06 14:46:47 +01:00
MascaraSnake
33c35230c2 Add missing glseg checks (and remove a superfluous one) 2020-01-06 14:40:59 +01:00
MascaraSnake
b9a8ebbdac Merge branch 'move-map-copying' into 'next'
Reorder map loading

See merge request STJr/SRB2!635
2020-01-06 04:24:39 -05:00
Alam Ed Arias
4ffe5d0670 cleanup whitespace 2020-01-05 21:49:07 -05:00
Tatsuru
a50549aa7c Don't fuck with the fuse if it's negative 2020-01-05 23:41:22 -03:00
Tatsuru
ce45746d02 No comments 2020-01-05 23:19:52 -03:00
Tatsuru
89eda2fa9b :amybruh: 2020-01-05 23:18:38 -03:00
James R
2a6cf10f79 Merge branch 'lua-neatstuff' into 'next'
Extra functionality for lua

See merge request STJr/SRB2!601
2020-01-05 20:54:17 -05:00
Jaime Passos
652a71abf6 Merge remote-tracking branch 'origin/master' into more-opengl-fixes 2020-01-05 22:04:51 -03:00
Jaime Passos
c47ab3b31f Fix chroma key 2020-01-05 22:04:19 -03:00
James R
3d3b4d183f Merge branch 'fix-mouse-grabbing' into 'master'
Fix mouse being grabbed even when not used

See merge request STJr/SRB2!639
2020-01-05 18:46:13 -05:00
Louis-Antoine
059a09d00e Fix mouse being grabbed even when not used
The other way around this time.
2020-01-06 00:40:28 +01:00
Louis-Antoine
93e878b8f0 Revert "Fix mouse being grabbed even when not used"
This reverts commit 7d67be582b.
2020-01-06 00:38:40 +01:00
James R
db591f85e3 Merge branch 'vgetcolorfixes' into 'master'
Fix usage of V_GetColor

See merge request STJr/SRB2!638
2020-01-05 17:12:21 -05:00
James R
9f68fa0798 Merge branch 'appveyor-gcc-8.1' into 'master'
Use GCC 8.1 for AppVeyor 64-bit builds

See merge request STJr/SRB2!624
2020-01-05 17:12:06 -05:00
James R
a850a97300 Merge branch 'connect-ip-textbox' into 'master'
Add clipboard functionality to the Connect via IP textbox.

See merge request STJr/SRB2!597
2020-01-05 17:06:45 -05:00