Commit graph

139 commits

Author SHA1 Message Date
squeek
99c315a0fa Electric cloak/knife soundscript definitions from ff_dev
* Not sure why the knife sounds are in the player sounds
2016-04-24 11:25:36 -07:00
Alexander Laswell
f024737ad1 Merge pull request #51 from fortressforever/spanner-specialhit-sound
Fix the spanner special hit sound getting covered up by the clang sound
2015-10-03 15:38:51 -06:00
Alexander Laswell
35fabc5513 Merge pull request #53 from fortressforever/hud-keystate
Add script changes for hud_keystate addition
2015-10-03 15:15:30 -06:00
squeek
8865703ff6 Add script changes for hud_keystate addition 2015-08-11 01:26:45 -07:00
Ryan Liptak
4d8e9d63b7 Merge pull request #45 from fortressforever/pyro-shotgun
Re-add single shotgun (now pellet gun) to pyro
2015-08-07 00:04:58 -07:00
Ryan Liptak
30eb75acb4 Merge pull request #44 from fortressforever/pellet-gun
Rename single shotgun to "Pellet Gun" and make it sound weak
2015-08-07 00:02:17 -07:00
squeek
188e3c78c1 Rename single shotgun to pellet gun and make it sound weak 2015-08-07 00:01:02 -07:00
Ryan Liptak
4b3f9e3f86 Merge pull request #49 from fortressforever/spam-is-bad
Increase monkey nade bag respawn time from 15 to 30 seconds
2015-07-03 15:23:33 -07:00
squeek
97de8673bf Increase monkey nade bag respawn time from 15 to 30 seconds
* Spam is bad
2015-07-02 20:08:21 -07:00
Alexander Laswell
fd0d9a03ac Merge pull request #48 from fortressforever/fixes/update-other-languages
adds FF_FORTPOINTS_DISABLE_SECURITY string to other languages
2015-06-07 11:08:34 -06:00
alaswell
7c54db6fe9 adds FF_FORTPOINTS_DISABLE_SECURITY string to other languages 2015-05-24 21:52:30 -06: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
Mike Parker
7a630e0b96 Merge pull request #46 from R00Ki3/Dispenser-cells-fix
Dispenser cells to build displayed incorrectly
2015-04-27 02:21:19 +01:00
R00Ki3
5d079c9a94 Update FortressForever_english.txt 2015-04-26 19:53:31 -05:00
squeek
2832e1ba04 Fix the spanner special hit sound getting covered up by the clang sound
* This plays when you successfully repair some amount of health/ammo of a SG/disp, but the channel made it so the clang would stop it from being heard
2015-04-25 14:54:46 -07:00
squeek
e88453419c Re-add single shotgun (now pellet gun) to pyro 2015-04-23 20:08:19 -07: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
Mike Parker
750db4cc7d Merge pull request #43 from pizzahut2/patch-2
Update userconfig_default.cfg
2015-04-22 19:41:05 +01:00
Mike Parker
33fd254a28 Merge pull request #42 from pizzahut2/patch-1
Update classcfg_default.cfg
2015-04-22 19:40:53 +01:00
pizzahut2
5a7a98a93a Update userconfig_default.cfg
Fixed wiki link.
2015-04-22 19:31:57 +02:00
pizzahut2
6007a9692b Update classcfg_default.cfg
Fixed wiki link.
2015-04-22 19:31:00 +02:00
Ryan Liptak
995d95ef3d Merge pull request #38 from fortressforever/file-local-stinks
Practicing what I preach: Removed all file-local variables from util/collection.lua
2015-04-14 21:12:06 -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
Ryan Liptak
bf3a101cf5 Merge pull request #37 from fortressforever/unused-script-keys
Remove unused DamageRadius keys from PL/RPG weapon scripts
2015-03-30 16:36:43 -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
90b3a9f15d Remove unused DamageRadius keys from PL/RPG weapon scripts
* Those values are defined in C++
2015-03-29 19:19:35 -07:00
Ryan Liptak
baf73ee3a4 Merge pull request #36 from fortressforever/default-name
Remove `name "WhenFFwillOut"` to make way for Steam Friends name as the default
2015-03-29 17:58:04 -07:00
squeek
8fa867b685 Remove name "WhenFFwillOut" to make way for Steam Friends name as the default
* See fortressforever/fortressforever#172
2015-03-29 17:33:45 -07:00
Ryan Liptak
800d609fef Merge pull request #35 from fortressforever/fixes/shutdown-backwards-compat
Fix backwards compatibility issue with base_shutdown
2015-03-28 18:08:10 -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
22f60ac1ec Revert accidental single shotgun removal from soldier 2015-03-27 00:00:14 -07:00
squeek
4dd2362040 Merge branch 'master' of https://github.com/fortressforever/fortressforever-scripts 2015-03-26 23:59:57 -07:00
Ryan Liptak
771a2d05bf Merge pull request #33 from fortressforever/versioning
Bump version to 2.5.0
2015-03-26 22:54:09 -07:00
squeek
c8de6cc716 Bump version to 2.5.0 2015-03-26 22:52:49 -07:00
squeek
584e4bb9fd Bump version to 2.5.0 2015-03-26 22:51:47 -07:00
Ryan Liptak
230f52bd87 Merge pull request #27 from fortressforever/collection-impl-lua
Move Collection implementation to Lua
2015-03-26 20:47:22 -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
35493f7331 Merge pull request #32 from AfterShockFF/lua-trails-on-flags
Add trail to flags
2015-03-27 02:14:21 +00: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