Commit Graph
98 Commits
Author SHA1 Message Date
flowtronandszyk (grenadier) 9a7a00017c (trans)porting commit 14cc157 from libcurl4_1202_hotfix
Co-authored-by: "szyk (grenadier)" <[email protected]>
2021-07-11 09:44:07 +02:00
drian 143890eab9 mergefix 2021-02-14 20:02:03 +01:00
drian b615fe449e Merge remote-tracking branch 'remotes/origin/next' into release_v1.3 2021-02-10 21:00:09 +01:00
drian bc6941d30c Merge remote-tracking branch 'remotes/origin/libcurl4_1202_hotfix' into release_v1.3 2021-02-10 20:40:40 +01:00
aurhat 8bb1aba638 Fix warnings for gcc 9.3 2020-11-03 22:15:34 +01:00
ac-stefandaurhat 19bb560dd2 more SDL2-related backports from sauer
* use keyrepeat and textinput switch code from sauer (on windows, opening
  a console with "t" also produced a "t" as text otherwise)
* screenw and screenh are now cubescript-variables that always reflect
  the actual resolution of the screen or the window

DOCREF screenw screenh
2018-02-10 11:28:49 +01:00
Jani-Markus Maunusandaurhat f86579533a Ported AC to SDL2 2018-02-10 11:28:48 +01:00
ac-stef 1fe478aae4 cleanup protocol
...and get master to compile again

DOCREF hudextras mapstats_hud nextGameMode
2017-06-27 15:15:25 +02:00
ac-stef ec2cdb4533 print filenames for errors in map and model config files 2017-05-17 14:13:45 +02:00
ac-stef 9afca836c9 cleanup
bring clang (and g++) back to O3
cleanup jpegenc error handling
2016-09-19 18:16:19 +02:00
ac-stef 29a3970b72 fix flyspeed
and a compiler optimisation error

(for clang >= 4, O3 may be reactivated in the makefile)
2016-09-09 22:22:55 +02:00
ac-stef 826499c12d enable gcc to check arguments of printf-like functions
Check printf-like functions like conoutf, if format strings and argument
lists match.

This commit also fixes a lot of code parts that actually had mismatching
argument lists - or did things, that this check does not like.

numtime() was rewritten in an ugly but very portable fashion (it's
recommended to stay away from "long long" format entries, because errors
usually only come up at runtime).

(some code was copied from sauer)
2015-08-02 19:40:41 +02:00
ac-stef 3d1f7d9b95 fix mapmodel occlusion when using pitch and roll
may need a bit more work, though
2015-06-05 16:00:03 +02:00
ac-stef ae82b6b22e add attr5..7, add mapmodel pitch and roll
Keys 5, 6 and 7 (in combination with the scrollwheel) can be used to alter
the new entity attributes.

Pressing editmeta (LCTRL by default) speeds up the scrolling.

(Parts of the roll code are borrowed from Alejandro V. Garcia's commit
"Model rotations, experimental" from January 2013)

Note: coop edit is now broken between "next" and older clients, but I
  don't want to bump the protocol just yet.
2015-05-18 14:59:41 +02:00
ac-stef e318ecd68e integrated automatic embedded map config files
This patch enables an option to keep the map config embedded in the map
file - with autogenerated content. Any changes to map config data will be
written with the map. This includes data by loadnotexture, loadsky,
mapmodel, texture, fog, fogcolour, mapsound and shadowyaw. Once enabled,
all changes with those commands become persistent to the map.

New variables:

mapsoundchanged
  Set to "1" with every command that changes mapsound slots. Should be
  used to trigger a rebuild of mapsound menus.

New/changed commands:

mapsound
  Now returns the number of the created slot.

mapmodel
  Now returns the number of the created slot.

texture
  Now returns the number of the created slot.

loadsky
  Is now a builtin string variable (instead of a command), which means,
  that the current value can easily be retrieved or edited.
  The skymap name in the argument is now required to start with
  "textures/skymaps/" - but that part of the path can be omitted.
  examples:
    loadsky steini/steini2 (loads textures/skymaps/steini/steini2_*)
    loadsky textures/skymaps/steini/steini2 (same)
    loadsky ../foo/bar (loads textures/foo/bar_*)
    echo $loadsky

getnotexture
  Returns the current "notexture" path. (Set by loadnotexture)

dumpmapconfig (available for debug binaries only)
  Writes the current automatically generated map config to
  dumpmapconfig.txt.

DOCREF mapsoundchanged mapsound mapmodel texture loadsky getnotexture
2015-05-18 14:46:03 +02:00
ac-stef ad263ea375 avoid triggering ASSERT due to insufficient floating point precision
For bigger lastmillis and zero basetime in combination with odd values for
as.speed, t can become negative due to rounding errors.

(time: 3404565, as.speed: 43,47826 -> t: -0,00575)
2015-05-17 00:21:28 +02:00
ac-stef 644d464cac fix: keep g++ attributes to g++ only
prevent wannabe compilers from parsing GNUC-only code
(clang++ apparently defines __GNUC__)
2014-05-17 14:27:43 +02:00
ac-stef de5deae8e3 fix: gcc crashing the client
This workaround lowers the optimisation level for those parts of the code,
that gcc 4.7 (and probably other versions) would compile to a binary that
crashes after a while. The previous solution for this so-called "linux bug"
was to use clang instead of gcc.

Thx, Jpablon, for doing all the work on this.
2014-05-14 22:17:20 +02:00
Bukz 5957f50e33 setskin() fix
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7206 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2013-02-15 05:32:53 +00:00
Lucas GAUTHERON 8c084668cb disabling some debugging commands
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7020 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2012-12-31 12:19:31 +00:00
sireus 77c2dd3944 fixed some issues found by cppcheck
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6740 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2011-12-19 21:02:57 +00:00
Lee Salzman be94c703f2 setsize -> shrink
setsizenodelete -> setsize
deletecontentsa -> deletearrays
deletecontentsp -> deletecontents
vrealloc -> growbuf



git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4787 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2010-03-11 23:06:26 +00:00
Lee Salzman b216767f2f remove stray 9
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4760 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2010-01-11 18:52:09 +00:00
Lee Salzman 937e615e97 file mode fix
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4719 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2009-11-08 01:11:53 +00:00
Lee Salzman 9256ee374b support for loading from zip files
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4717 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2009-11-08 00:53:19 +00:00
Lee Salzman e725e5ed8c string function cleanups
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4714 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2009-11-07 22:44:32 +00:00
Lee Salzman 287f6ae331 added texreduce var
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4028 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2008-12-16 13:45:03 +00:00
Lee Salzman f515200c37 cleaned up control flow
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3759 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2008-11-25 19:16:41 +00:00
Lee Salzman 75551b478c made mdldlist var persist
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3757 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2008-11-25 18:50:25 +00:00
Lee Salzman 388717f336 option to turn off display lists explicitly for buggy drivers
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3756 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2008-11-25 18:49:34 +00:00
Lee Salzman 38748de8fa different s3 bug workaround
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3753 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2008-11-25 05:17:41 +00:00
Lee Salzman daf3f5f090 reverting attempted bug workaround
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3752 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2008-11-25 05:00:28 +00:00
Lee Salzman ccd21deb78 another bug workaround attempt
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3751 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2008-11-24 21:43:01 +00:00
Lee Salzman fcdbcf5b0d attempting workaround for S3 graphics bug
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3729 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2008-11-22 17:14:23 +00:00
Lee Salzman 95cad2c3d1 removed libGLU dependency
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3280 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2008-10-27 07:41:46 +00:00
Lee Salzman 6004e8f432 matrix stack cleanup
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3271 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2008-10-26 04:13:39 +00:00
Lee Salzman f213f43684 do texgen last to minimize calcs
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3003 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2008-10-14 04:30:32 +00:00
Lee Salzman cfdf56e94b shadow projection cleanup
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3001 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2008-10-13 18:44:18 +00:00
Lee Salzman b1cf271061 use projective texturing for blob shadows
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2996 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2008-10-13 13:31:33 +00:00
Lee Salzman e11a5f5514 better hitbox testing
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2992 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2008-10-13 01:17:44 +00:00
Lee Salzman a17d0e5ca8 glmatrix cleanup
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2761 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2008-09-25 12:14:20 +00:00
Lee Salzman 2bb4ac8efd const tweaks
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2708 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2008-09-19 06:30:44 +00:00
Lee Salzman 6856bbbd5c removing unnecessary side check
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2680 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2008-09-18 03:43:44 +00:00
Lee Salzman ff25419d96 light cache lookup fix
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2671 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2008-09-17 21:45:23 +00:00
Lee Salzman 70b5088e0e color array invalidation fix
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2670 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2008-09-17 21:35:10 +00:00
Lee Salzman d4fd8b6440 vertex lighting bug fix
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2658 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2008-09-17 03:36:59 +00:00
Lee Salzman b76491d06e vertex lighting option for mapmodels
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2656 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2008-09-17 03:34:58 +00:00
Lee Salzman a0aedcf0a6 stencil debugging info cleanup
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2599 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2008-09-14 23:49:08 +00:00
Lee Salzman b6aa3322a0 64 bit fix
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2586 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2008-09-14 17:46:45 +00:00
Lee Salzman 31ab7f4553 shadow rendering optimizations
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2581 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2008-09-14 06:56:34 +00:00