fortressforever/fortressforever-scripts
0
0
Fork 0
mirror of https://github.com/fortressforever/fortressforever-scripts.git synced 2024-11-22 04:31:07 +00:00
Code Issues Projects Releases Packages Wiki Activity
144 commits 12 branches 1 tag 1.8 MiB
Commit graph

57 commits

Author SHA1 Message Date
squeek
97de8673bf Increase monkey nade bag respawn time from 15 to 30 seconds 
* Spam is bad
 2015-07-02 20:08:21 -07:00
alaswell
25009c6367 Merge branch 'master' into features/disabling-security-rewards 
Conflicts:
	resource/FortressForever_english.txt
 2015-05-24 18:04:48 -06:00
alaswell
06c826494c string now localized 
points now a global var and set to 50
 2015-05-23 20:22:37 -06:00
alaswell
827af8a859 gives a player fortress points and displays a HUD message whenever a player disables security 2015-05-17 19:23:07 -06:00
Ryan Liptak
261bd01762 Merge pull request #39 from fortressforever/flag-touch-bounds 
Increase flag touch bounds a bit
 2015-04-23 15:05:27 -07:00
squeek
c586b718b4 Increase flag touch bounds a bit 
* Height from 65% of model height to 80%
 * Width from 100% of model width to 150%
  + Stops a single SG from being able to completely block the flag, though you can still make it difficult to grab
 * See fortressforever/fortressforever#166

Flag model bounds: 26.254800796509 x 69.179306283593
Flag bounds before this change: 26.254800796509 x 45.048884835839
Flag bounds after this change: 39.382202148438 x 55.155250549316
 2015-04-12 14:06:22 -07:00
squeek
5a30b6255d Practicing what I preach: Removed all file-local variables from util/collection.lua 
File local variables frustrated me to no end in the Don't Starve codebase; they have no real reason for existing and they only serve to limit mod-ability (their implementation would have to be copy+pasted for any other file to use it and the implementation can't be modified by other files), so they should be generally avoided.
 2015-04-05 12:46:11 -07:00
squeek
f48571d932 Fix typo in base_chatcommands.lua 2015-04-05 12:36:18 -07:00
squeek
fe1797af7d Merge in schtop_k lua changes 
* See SVN r15059
 2015-03-30 16:30:59 -07:00
Ryan Liptak
74be39dc65 Merge pull request #34 from fortressforever/fixes/timer-bug-compensation 
Fix various HUD timers getting added with time + 1
 2015-03-29 23:12:53 -07:00
squeek
30d9db6d6d Fix backwards compatibility issue with base_shutdown 
- 'hurt' got removed, which some maps use
 2015-03-28 17:51:04 -07:00
squeek
3dbf931bbe Fix various HUD timers getting added with time + 1 2015-03-27 11:14:21 -07:00
squeek
fef39bebc7 Finish Collection implementation 
* Depends on https://github.com/fortressforever/fortressforever/pull/134
 2015-03-26 20:01:33 -07:00
squeek
3a63082b07 Add some misc table util functions 2015-03-26 20:01:33 -07:00
squeek
e8c59ff5ec Allow GlobalEntityList to be iterated by pairs and ipairs 
* See 6309529590

Example usage:

for ent_id, ent in pairs(GlobalEntityList) do
  print(ent_id, ent)
end

Note: The order of iteration is always arbitrary
 2015-03-26 20:01:32 -07:00
squeek
171376e24c Start of Lua-based collection implementation 
* Will eventually replace the entire Collection userdata with full backwards compatibility
 * See fortressforever/fortressforever#91
 2015-03-26 20:00:16 -07:00
Ryan Liptak
4dac32dcf9 Merge pull request #29 from fortressforever/fix-class_info 
Don't crash if class_info() is called on non-luabind objects
 2015-03-26 19:14:39 -07:00
Mike Parker
de3e235cfb Add trail to flags 2015-03-27 02:07:49 +00:00
Ryan Liptak
adbee54a18 Merge pull request #26 from fortressforever/lua-class 
Add standard Lua Class implementation
 2015-03-24 15:27:35 -07:00
squeek
e5e5e1735b Don't crash if class_info() is called on non-luabind objects 
* See 2c6c9054e3
 2015-03-24 12:36:03 -07:00
Alexander Laswell
5d8f3cd3ab Merge pull request #28 from fortressforever/fixes/ff-dm-names 
Change team names to something more appropriate
 2015-03-24 00:03:46 -06:00
alaswell
e2f65b31bf Change team names to something more appropriate 
contributes to fortressforever/fortressforever#135
 2015-03-23 23:49:11 -06:00
squeek
bae25ad3b1 Add standard Lua Class implementation 2015-03-23 04:10:08 -07:00
Ryan Liptak
b4d26d38c3 Merge pull request #21 from fortressforever/features/ctf-security-timer 
adds a timer on the HUD that reflects how long security is down for
 2015-03-21 22:18:21 -07:00
Ryan Liptak
a28975e24d Merge pull request #24 from fortressforever/cleanup/add-cornfield 
Re-add ff_cornfield
 2015-03-21 21:43:27 -07:00
squeek
18e497f053 Use SECURITY_LENGTH instead of SECURITY_LENGTH+1 2015-03-21 21:39:39 -07:00
squeek
ddb60b1443 Make cornfield use base_id instead of base_id_new 
* See fortressforever/fortressforever#60
 2015-03-21 19:32:24 -07:00
squeek
231656c31d Remove ff_push 
* See fortressforever/fortressforever#6
 2015-03-21 19:27:53 -07:00
squeek
918c4afcf3 Re-add ff_cornfield 
* See fortressforever/fortressforever#6
 2015-03-21 19:27:16 -07:00
alaswell
ee2e31bece adds a timer on the HUD that reflects how long security is down for 2015-03-16 12:31:24 -06: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
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
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