Sally Coolatta
c0ba14a752
Use sounds.pk3 instead of sounds.wad
2021-04-25 20:42:25 -04:00
Sally Coolatta
de1f67b72a
Use strings in the map header for next level, marathon next, thumbnails, minimaps, encoremaps, and tweakmaps
2021-04-09 21:10:46 -04:00
Sally Coolatta
359cf86efb
Merge branch 'master' into big-large-map-markers
2021-04-09 19:49:33 -04:00
Sally Coolatta
8bb1fa57d4
Merge branch 'master' into 22-merge-again
2021-04-05 01:11:26 -04:00
James R
04b6911e21
Merge branch 'sloped-camera' into 22-merge-again
2021-04-01 20:55:22 -07:00
toaster
72defa325f
* Add a seperate step for I_STARTUPSKINS - "Load characters" - since it takes a similar length to loading all other types of sprites.
...
* Adjust several loading strings, and left-align their rendering.
* Don't call HU_LoadGraphics() again (startup cached ALL FONTS twice).
* Adjust when some functions are called during loading to more effectively compartmentalise sections of loading that depend on each other.
* LOADED_ISTARTUPGRAPHICS now comes after SCR_Startup, as we can explicitly guarantee the palette has been loaded after that function.
* Make sure everything closely related to configurations (gamedata, console stuff, etc) which is not directly dependent on anything else is loaded under LOADED_CONFIG - "Load settings" (formerly LOADED_MINIT).
* The `-warp` command line parameter is now checked alongside LOADED_DCHECKNETGAME.
* Don't attempt to draw the loading bar before LOADED_ISTARTUPGRAPHICS, as the palette is not loaded, which means you're wasting cycles on a white screen.
2021-03-29 17:02:08 +01:00
toaster
f7f1202a37
woops
2021-03-28 20:20:06 +01:00
toaster
99a764dbc0
Loadbar plus.
...
* Resolves #145 .
* Increased granularity, to seperate out texture loading and sprite loading from other render structure initialisation.
* Shows small loading string in DEVELOP builds, to show where we can optimise loading times when we're polishing.
* Clean up con_refresh/startup, which got split into two variables in the merge by mistake.
2021-03-28 20:16:47 +01:00
James R
ec00710396
Use 2.2's version of the -warp parameter
2021-02-28 21:51:44 -08:00
Sally Coolatta
4c9aceded1
Merge remote-tracking branch 'srb2/next' into 22-merge-again
2021-02-28 21:03:09 -05:00
Jaime Ita Passos
a8909190ff
Fix "implicit declaration of function 'DEH_TableCheck'" warning
2021-02-27 12:04:48 -03:00
James R
6cb0e9667d
Conflicts da7e79ac83 d5688f53a0
2021-02-27 03:29:01 -08:00
James R
1ce3a7dd56
Conflicts cb3660331a 031665cdf
2021-02-27 03:26:17 -08:00
Sally Coolatta
9d7ec0ab8f
Merge SRB2 next
...
Probably doesn't compile yet, but I got rid of all of the conflicts for anyone who wants to take a stab at it.
2021-02-27 05:18:36 -05:00
X.organic
5e832ece89
Move Dehacked table sanity check to deh_tables.c
2021-02-16 19:46:31 +01:00
James R
dd5223f4d7
Draw an icon above players when they are typing in chat or console
...
A little speech bubble is drawn, with dots cycling as they type.
No typing = no dots.
2021-02-16 09:24:22 -08:00
Sally Coolatta
2af75a2bd1
Fix merge conflicts
2021-01-11 00:06:34 -05:00
Sally Coolatta
a14cf1f029
Merge branch 'master' into new-menus
2021-01-10 21:31:09 -05:00
SteelT
29b5f38347
Merge branch 'master' into big-large-map-markers
...
# Conflicts:
# src/d_netcmd.c
2021-01-09 15:52:34 -05:00
James R
bd560130d5
Merge branch 'holy-zip' into 'next'
...
Disallow pk3s with extra bytes
See merge request STJr/SRB2!1275
2020-12-10 15:21:20 -05:00
James R
2e649de64f
Merge branch 'high-resolution-timer-2' into next
2020-12-10 02:55:02 -08:00
James R
d5688f53a0
Don't print W_VerifyFile errors more than once
2020-11-28 20:51:21 -08:00
Jaime Ita Passos
490758eac2
Remove SHORT macros for referencing patch width/height/offsets
2020-11-22 20:02:47 -03:00
Jaime Ita Passos
2170ca3a50
Some interface fixes
2020-11-22 17:22:18 -03:00
Jaime Ita Passos
be274a4fa9
Merge branch 'next' into spritestuff2
2020-11-19 00:52:43 -03:00
Sally Coolatta
e6a9e5a68e
Merge branch 'master' into new-menus
2020-11-08 02:49:28 -05:00
James R
27fbf77922
Huge perfstats refactor
...
I needed to update it to make it functional with the precise timer. But I also
got sick of looking at the mess of sprintf followed by draw call.
2020-11-07 01:32:59 -08:00
James R
66f67267c7
Remove duplicated code
2020-10-31 20:32:44 -07:00
James R
8f68a21f2f
Fix many instances of G_BuildMapName
...
Some things are gonna be busted. Fix it later, BYE.
2020-10-31 20:17:12 -07:00
James R
d5b52d8ff3
Use 2.2's version of the -warp parameter
2020-10-31 19:41:38 -07:00
James R
a669724217
Kill alreadyExists, check for map replacement by going through the level headers and using W_CheckNumForMapPwad
2020-10-31 18:49:50 -07:00
James R
37c345c7eb
Map lump names can be anything, map number is dynamically allocated
2020-10-30 20:10:31 -07:00
James R
81b8abed53
Merge remote-tracking branch 'origin/master' into paper-items-i-hate-my-life
2020-10-28 21:51:28 -07:00
James R
f5329f25bf
Use music.pk3
2020-10-27 17:20:57 -07:00
Sally Coolatta
b83f9afecb
Merge branch 'master' into battle-rethink
2020-10-26 22:22:40 -04:00
James R
9bff8c2ecb
Remove the other -splitscreen parameter
2020-10-26 19:03:24 -07:00
Sally Coolatta
1665e72b99
Merge branch 'the-scary-22-merge' into battle-rethink
2020-10-25 13:56:53 -04:00
Sally Coolatta
c93330bf20
Use enum for better maintainability & error checking
2020-10-25 11:34:15 -04:00
Sally Coolatta
3469ab12ba
Add extra warning for CON_STARTUP_LOADSTEPS being incorrect
2020-10-25 10:48:32 -04:00
Sally Coolatta
12f56d64a7
Adds a simple white loading bar at the bottom of startup, instead of covering the cool reference with text
...
Mockup of what it looks like, since the window's invisble when you try to print-scr it: https://cdn.discordapp.com/attachments/275750804227489794/769931098636943391/unknown.png
2020-10-25 10:35:24 -04:00
Sally Coolatta
2509d5a29c
Merge branch 'the-scary-22-merge' into battle-rethink
2020-10-24 21:39:32 -04:00
Sally Coolatta
7c2bd0d1c2
Merge remote-tracking branch 'srb2/next' into the-scary-22-merge
2020-10-24 20:50:58 -04:00
Sally Coolatta
9b6aa946ea
Merge remote-tracking branch 'srb2/master' into the-scary-22-merge
2020-10-24 19:28:06 -04:00
Sally Coolatta
fda698a290
Merge master
2020-10-24 18:34:07 -04:00
Louis-Antoine
ddec491b0b
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into resend-gamestate
2020-10-24 16:21:44 +02:00
Sally Coolatta
7430df5f4f
Fix time limit, make overtime kill you instantly and close in faster, remove minimum radius
...
Radius SHOULD be doubled to 8192 to be reasonable... but something gets severely messed up, makes me MAD
2020-10-22 05:36:36 -04:00
James R
f34a761d48
Merge branch 'perfstats' into 'next'
...
Performance stats
See merge request STJr/SRB2!1186
2020-10-18 15:33:20 -04:00
Jaime Passos
b44837324f
Merge branch 'next' into patch-stuff-again-2
2020-10-10 17:01:10 -03:00
Hannu Hanhi
24ff748c58
Performance stats
2020-10-10 22:12:34 +03:00
James R
737ea51ace
Merge remote-tracking branch 'origin/the-scary-22-merge' into sloped-camera
2020-10-04 16:32:19 -07:00
