Commit graph

102 commits

Author SHA1 Message Date
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
Ryan Liptak
2cacde278a Merge pull request #31 from fortressforever/fix-xhair-dropdown
Fix "use global crosshair for all" checkbox label getting cut off
2015-03-24 14:57:43 -07:00
squeek
07fb48f055 Fix "use global crosshair for all" checkbox label getting cut off 2015-03-24 14:56:33 -07:00
Ryan Liptak
8c2083b433 Merge pull request #30 from fortressforever/fix-xhair-dropdown
Fix weapon dropdown having the wrong name
2015-03-24 14:51:32 -07:00
squeek
1e2bd31929 Fix weapon dropdown having the wrong name
* Contributes towards fortressforever/fortressforever#142
2015-03-24 14:50:28 -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
Ryan Liptak
073937f54e Merge pull request #23 from fortressforever/cleanup/remove-push
Remove ff_push
2015-03-21 21:40:57 -07:00
squeek
18e497f053 Use SECURITY_LENGTH instead of SECURITY_LENGTH+1 2015-03-21 21:39:39 -07:00
Ryan Liptak
67a470a4e2 Merge pull request #15 from fortressforever/fixes/font
Improve HUD font: add Latin-1 Supplement and other missing chars
2015-03-21 21:13:54 -07:00
Ryan Liptak
1e3a55753e Merge pull request #8 from fortressforever/language/portuguese-br
Add Portuguese (BR) translation by Gemini Saga
2015-03-21 21:13:21 -07:00
Ryan Liptak
c22dbf4a35 Merge pull request #9 from fortressforever/language/russian
Add (incomplete) Russian localization by Gordon
2015-03-21 21:13:15 -07:00
Ryan Liptak
aaf44640da Merge pull request #10 from fortressforever/language/spanish
Add Spanish translation by VMX and Firefox11
2015-03-21 21:13:04 -07:00
squeek
25e0e0e42a Fix sizes of various fonts due to the fixed height of the HUD font 2015-03-21 21:09:58 -07:00
squeek
5e75dbba7e Improve HUD font: add Latin-1 Supplement and other missing chars
* Adds things like custom accented chars, #, &, $, ~, etc
 * Still missing some Latin-1 Supplement characters (copyright, paragraph, and whatnot)
 * Allows for non-broken Spanish/Portuguese translations (see #10, #8)

Note: Due to the added accented chars, the Win Ascent was bumped up so that the accents do not cause the characters to be clipped. This alters the default line height of the font, which makes the text much smaller in-game. To compensate, the font sizes should probably be bumped up in the Scheme.res files.
2015-03-21 21:09:58 -07:00
Ryan Liptak
519ef5d71d Merge pull request #7 from fortressforever/fixes/unicode-support
Fix unicode character support in VGUI/HUD elements
2015-03-21 21:08:12 -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
Ryan Liptak
17ffdce9c8 Merge pull request #22 from fortressforever/fixes/hammer-gameinfo
Update gameinfo.txt SearchPaths to work with the new Hammer setup
2015-03-19 23:31:36 -07:00
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
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
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