Commit graph

61 commits

Author SHA1 Message Date
squeek
31e2952cfc Update gameinfo.txt SearchPaths to work with the new Hammer setup
* See also fortressforever/fortressforever-maps#1
2015-03-19 21:50:23 -07:00
Ryan Liptak
6c72c87583 Merge pull request #20 from R00Ki3/Features/sniper-nails
Make sniper rifle use nails as ammo
 * Removes the shared ammo between the sniper rifle and auto rifle, because with the removal of the nailgun, the sniper would have no guns left if they run out of shells
2015-03-10 11:50:54 -07:00
R00Ki3
b0e05551db Update ff_playerclass_sniper.txt 2015-03-10 11:21:20 -05:00
R00Ki3
1b2b0d5b58 Update ff_weapon_sniperrifle.txt 2015-03-10 11:12:56 -05:00
Ryan Liptak
c001832e96 Merge pull request #12 from fortressforever/features/remove-nailgun-sniper
Remove nailgun from sniper
2015-03-09 01:13:55 -07:00
squeek
4edd5af280 Remove nailgun from sniper
* Contributes towards fortressforever/fortressforever#93
2015-03-09 01:12:38 -07:00
Ryan Liptak
0e52fbc505 Merge pull request #13 from fortressforever/features/avd-defenders-objective
Fixed defender's objective tracking flag carrier AvD
2015-03-09 00:58:04 -07:00
Ryan Liptak
b219f4d43d Merge pull request #14 from fortressforever/features/id-defenders-objective
Fixed defender's objective tracking flag carrier ID
2015-03-09 00:52:26 -07:00
Ryan Liptak
cf74cf20ba Merge pull request #16 from fortressforever/cleanup/encrypted-scripts
Unencrypt the player/weapon scripts
2015-03-08 23:49:26 -07:00
squeek
5d4aa75c4b Unencrypt the player/weapon scripts
* Encryption no longer serves a purpose with FF being open source and the original reason for the encryption should be addressed by fortressforever/fortressforever#7 instead
 * Them being unencrypted allows for understandable/reviewable commits
2015-02-01 03:08:28 -08:00
alaswell
e1902e6f36 better custom startup() than simply overwriting;
see http://forums.fortress-forever.com/showthread.php?t=23070
2015-01-20 19:12:31 -07:00
alaswell
66fab40a5c moved DEFENDERS_OBJECTIVE_ONCAP/_ONCARRIER/_ONFLAG out of startup() 2015-01-18 22:39:53 -07:00
alaswell
ddf7b29a58 Convert ff_ksour.lua to take advantage of the new base_id.lua 2015-01-10 17:12:59 -07:00
alaswell
9dcff94c02 Revert/Convert ff_palermo.lua to take advantage of the old base_id.lua 2015-01-10 17:07:57 -07:00
alaswell
d4eccc6d50 Convert ff_napoli.lua to take advantage of the new base_id.lua 2015-01-10 17:03:45 -07:00
alaswell
dd72eaa6fb May as well add this functionality to here too:
Added DEFENDERS_OBJECTIVE_ONCAP, _ONFLAG, AND _ONCARRIER globals to allow for different objectives on D
Added UpdateDefendersObjective() function
	- makes it easier to change objective and removes some redundancy
2014-12-26 20:33:12 -07:00
alaswell
0ed27a40b0 Removed unnecessary/redundant info I added (thanks squeek :D) 2014-12-26 20:07:49 -07:00
alaswell
6c5357fd3e Added DEFENDERS_OBJECTIVE_ONCAP global to allow for easy removal of D objective (completely) if needed
Added UpdateDefendersObjective() function
	- makes it easier to change objective and removes some redundancy
	- also fixes some old issues with _onflag and _oncarrier code

#58
2014-12-26 20:00:47 -07:00
alaswell
47d91154c7 Removed unnecessary/redundant info I added (thanks squeek :D) 2014-12-26 18:53:12 -07:00
alaswell
120176fca3 Added back DEFENDERS_OBJECTIVE_ONFLAG and
DEFENDERS_OBJECTIVE_ONCARRIER plus code

Changed DEFENDERS_OBJECTIVE_ONFLAG and
DEFENDERS_OBJECTIVE_ONCARRIER to false

Modified/Added if statements to keep old code and still see only
the cap and to include the UpdateTeamObjectiveIcon() for D so
that it only gets called when necessary
2014-12-23 01:40:22 -07:00
alaswell
5b669b3f9d Added DEFENDERS_OBJECTIVE_ENTITY to base_ad.lua
- defenders objective should point to cap always to avoid
           tracing the flag carrier (see issue #58)
2014-12-22 02:48:19 -07:00
alaswell
114e18a93f Removed DEFENDERS_OBJECTIVE_ONFLAG and DEFENDERS_OBJECTIVE_ONCARRIER
and all associated updates/calls from base_id.lua
	- defenders objective should point to cap always to avoid
           tracing the flag carrier (see issue #58)
2014-12-22 01:17:22 -07:00
Ryan Liptak
66c2a7e06b Merge pull request #11 from fortressforever/cleanup/map-guide-menu
Remove the map guide menu and make the Flythrough button go directly to the flythrough
2014-12-14 17:40:14 -08:00
squeek
c9003ed45d Remove the map guide menu and make the Flythrough button go directly to the flythrough 2014-12-13 19:13:29 -08:00
squeek
ddd51a593e Clean up language files a bit
* gameui.txt does not need any of the base SDK strings; those will still get loaded from the SDK language files (side note: the main menu strings *must* be in gameui.txt)
 * Removed unused GameUI_GameMenu_FortressOptions string from FortressForever_english.txt
2014-12-09 23:41:34 -08:00
squeek
0a6cb07bb6 Delete unnecessary TrackerScheme.res
* FF didn't make any changes, so there's no reason for it to be in the FF files
2014-12-09 23:39:25 -08:00
squeek
3c90ae7270 Remove unused/outdated Font Layouts.txt 2014-12-09 23:16:34 -08:00
squeek
978cfae096 Add hud_fastswitch and hud_weaponselect to the Fortress Options "HUD" section
* See fortressforever/fortressforever#90
2014-12-08 17:31:58 -08:00
Ryan Liptak
5ac78e4828 Merge pull request #2 from fortressforever/features/remove-single-shotgun
Remove the single shotgun from the hwguy, medic, and pyro
2014-12-07 19:29:05 -08:00
Ryan Liptak
d41852846a Merge pull request #3 from fortressforever/features/default-cfgs
Distribute default configs instead of <classname>.cfg/userconfig.cfg directly
2014-12-07 19:28:27 -08:00
Ryan Liptak
3fca1cd207 Merge pull request #4 from fortressforever/cleanup/cfg-files
Remove various unused/outdated cfg files
2014-12-07 19:28:10 -08:00
squeek
444e25dd6a Remove various unused/outdated cfg files 2014-12-07 18:57:16 -08:00
squeek
b641aa3086 Distribute default configs instead of <classname>.cfg/userconfig.cfg directly
* See fortressforever/fortressforever#87
2014-12-07 18:11:57 -08:00
squeek
ff0331566b Remove the single shotgun from the hwguy, medic, and pyro
* See fortressforever/fortressforever#82
2014-12-05 01:55:52 -08:00
Ryan Liptak
c3dfd19ae1 Merge pull request #1 from fortressforever/features/better-base-shutdown
Better base_shutdown.lua
2014-12-02 20:55:52 -08:00
squeek
8bf25793c4 Review: Avoid the ternary operator and remove redundant safety when saving base security_* functions 2014-12-01 18:37:55 -08:00
squeek
3c7a7e7426 base_shutdown: Fix security clips not being defined and add support for toggling multiple clips with the same name 2014-12-01 17:39:07 -08:00
squeek
076b54ebf4 💄 2014-12-01 17:05:40 -08:00
squeek
d5adad6174 Convert ff_schtop.lua to take advantage of the new base_shutdown.lua 2014-12-01 16:59:21 -08:00
squeek
4dc3ed5f9f Convert ff_openfire.lua to take advantage of the new base_shutdown.lua 2014-12-01 16:49:42 -08:00
squeek
e7b100c21d Convert ff_destroy.lua to take advantage of the new base_shutdown.lua 2014-12-01 16:46:22 -08:00
squeek
1cb481bc06 Convert ff_aardvark.lua to take advantage of the new base_shutdown.lua 2014-12-01 16:40:26 -08:00
squeek
1c9e2a0efd Convert ff_shutdown2.lua to take advantage of the new base_shutdown.lua 2014-11-30 23:38:56 -08:00
squeek
1f5fbe6bba Improve base_shutdown.lua
* Add built-in support for trigger-based buttons (blue_security_trigger/red_security_trigger)
 * Add built-in support for Lua-defined security shutdown length (SECURITY_LENGTH)
 * Add built-in support for turning on/off lights, brushes, trigger_ff_clips, and trigger_hurts
 * Add some helpful team-oriented trigger definitions in base_teamplay.lua
2014-11-30 23:37:55 -08:00
squeek
6c818f5cec Increase flag touch bounds a bit
* Set to 100% width and 65% height, up from 75% width and 50% height
2014-11-30 18:30:05 -08:00
squeek
24438e3e45 Replay the following commits because they got accidentally stomped by 277bdf3fe4:
Tiny cleanup of gameinfo.txt

Add JumpPad.Build and JumpPad.Explode soundscript definitions
 * Allows these sounds to be separated from detpack build/expode for customization purposes

Fix JumpPad.Explode soundscript definition not being based on Detpack.Explode

---

Also serves as a test of line ending stability; the goal is for these line endings to still checkout as CRLF on the Github Subversion mirror
2014-11-29 22:33:41 -08:00
squeek
40d658e20d Fix all files being "modified" since the last commit
* The files were not actually different, but git insisted that they were; for some reason a blank .gitattributes seems to work, but deleting .gitattributes did not
2014-11-29 22:27:51 -08:00
Ryan Liptak
277bdf3fe4 Test CRLF line-endings commit from SVN checkout of Github repo 2014-11-29 22:17:28 -08:00
squeek
a7e78c7ca7 Enforce clrf line-endings 2014-11-29 21:55:54 -08:00
squeek
398be49814 Fix JumpPad.Explode soundscript definition not being based on Detpack.Explode 2014-11-28 21:18:05 -08:00