Commit Graph
23722 Commits
Author SHA1 Message Date
Jason Felds 95f3872365 Tidying up of the pulling of the SMLAN server. 2006-11-24 13:26:08 +00:00
Josh Allen 4e91f9add3 Pull out the SMLAN server. Its very out of date and not used, besides the SMO server can act as a lan server. 2006-11-24 07:13:27 +00:00
Josh Allen 23e97d9d2e Pull out the SMLAN server. It very out of date and not used besides the SMO server can act as a lan server. Also add a newline to the scoreboard. 2006-11-24 07:04:39 +00:00
Mike Calfin 7d243815b0 did someone set ScreenCompany timer to 999 as a joke? reverted to 9 seconds. 2006-11-24 06:01:53 +00:00
Josh Allen bd483b69b1 Get the scoreboard grades the correct way and fix returned enumerated type from lua 2006-11-24 05:56:56 +00:00
Mike Calfin a508e359b8 turn off menu timer by default - no need for it in a home game 2006-11-24 05:17:11 +00:00
Mike Calfin f4bf9f95b2 changed prevscreen of NetworkOptions2 to LUA command 2006-11-24 04:45:13 +00:00
Mike Calfin a4b71154fa added LUA command for ScreenNetworkOptions2 nextscreen 2006-11-24 04:35:19 +00:00
Mike Calfin 1e7a638e43 changed main menu network options nextscreen to LUA command 2006-11-24 04:34:23 +00:00
Vecais Dumais Laacis e60bdd6348 Added png/jpeg libraries to be linked before directx ones. 2006-11-23 19:43:43 +00:00
Vecais Dumais Laacis a19f1d5f5b Add missing files.
Added png/jpeg libraries to be linked before directx ones.
2006-11-23 18:46:24 +00:00
Steve Checkoway be152b017e Add files. 2006-11-22 07:20:27 +00:00
Jason Felds 5ab5386932 Minor cleanup. 2006-11-22 06:18:38 +00:00
Steve Checkoway 2b762a116b Fix compile. 2006-11-22 05:51:10 +00:00
Glenn Maynard 2766d0b970 fix crash when GetCurrentStyle() == NULL 2006-11-22 02:07:38 +00:00
Glenn Maynard a5bb9fc32a remove GetCurrentStyleType 2006-11-22 02:07:08 +00:00
Glenn Maynard 98178e6700 GAMESTATE:GetCurrentStyleType -> GAMESTATE:GetCurrentStyle():GetStyleType 2006-11-22 02:06:00 +00:00
Glenn Maynard 476c34b3fe unneeded header 2006-11-22 01:59:33 +00:00
Glenn Maynard 29dd2b0473 move style icon into Lua 2006-11-22 01:58:11 +00:00
Glenn Maynard 81c407bc08 missing header 2006-11-22 01:56:07 +00:00
Glenn Maynard d1759bb123 Resolve directory names to embedded default.xml/default.lua files
at the pathname resolution stage (THEME:GetPath, ResolvePath),
not at loading.  This means that pathnames to Lua files are actually
paths to Lua files, without any extra processing, and we always
load actual files (except for BGAnimation compatibility), not
directories.

(fixes Lua LoadActor() on a directory loading as a BGA and not
as Lua)
2006-11-22 01:51:31 +00:00
Glenn Maynard 91f2f662b1 propagate metatable on merge 2006-11-22 01:19:03 +00:00
Glenn Maynard e96a4b7270 use a LocalizedString instead of depending on CommonMetrics 2006-11-21 23:32:39 +00:00
Glenn Maynard d14277274e Don't special case IsEditing. If you don't want a menu timer on a screen,
set TimerSeconds=-1.
2006-11-21 20:14:25 +00:00
Glenn Maynard 737436885d simplify 2006-11-21 20:08:41 +00:00
Glenn Maynard ef3b1b7218 MenuTimer is in SWME; move SM_MenuTimer there, too. (Screen no longer
needs GAMESTATE.)
2006-11-21 20:04:51 +00:00
Glenn Maynard ce86b65827 fix base call 2006-11-21 20:03:28 +00:00
Glenn Maynard 7ef6009567 Screen::JoinInput -> GameState::JoinInput 2006-11-21 19:57:58 +00:00
Glenn Maynard d591926ff7 Don't play sounds in JoinInput; let the caller do that.
Localize "only play start sound for the 2nd player who joins"
hack into ScreenSelect.
2006-11-21 19:52:18 +00:00
Glenn Maynard 9195740ded cleanup 2006-11-21 19:39:17 +00:00
Glenn Maynard 27fdc9101f join on IET_FIRST_PRESS only 2006-11-21 19:37:16 +00:00
Glenn Maynard 93efb67216 correct base 2006-11-21 19:33:24 +00:00
Glenn Maynard 52009ae6ee I'm not sure what was happening here:
If ALLOW_DISABLED_PLAYER_INPUT is true (only ScreenTitleMenu), then
ScreenSelect::Input doesn't do JoinInput ("the player will be joined
and the user will still be on the title menu").  However,
ScreenSelectMaster::MenuStart does the JoinInput anyway, so this still
happens.

If we want to have main menu options that don't load a screen, this
code path should be refactored a bit, to ask the derived class whether
the selection should also join.  As is, it's just making the JoinInput
path complicated.
2006-11-21 19:28:42 +00:00
Glenn Maynard 00fdeac301 remove empty 2006-11-21 19:06:54 +00:00
Glenn Maynard 44bb231639 separate slightly confusing logic - send COIN inputs with the normal input path 2006-11-21 19:04:24 +00:00
Glenn Maynard c4719461f9 fixup comment 2006-11-21 18:37:42 +00:00
Glenn Maynard 5eb98b88bd fixup 2006-11-21 18:36:44 +00:00
Glenn Maynard 8ada5509f5 simplify 2006-11-21 18:33:54 +00:00
Glenn Maynard efa198b4aa comment 2006-11-21 18:32:49 +00:00
Glenn Maynard 33f8e799fc fix GameSoundManager::PlayOnceFromAnnouncer 2006-11-21 18:32:33 +00:00
Glenn Maynard f4bdf5671e cleanup 2006-11-21 18:27:12 +00:00
Glenn Maynard 89785099b7 static -> const 2006-11-21 18:24:21 +00:00
Glenn Maynard f198f5c933 set params, not generated message names 2006-11-21 18:23:12 +00:00
Glenn Maynard 4516e1378a simplify 2006-11-21 18:22:20 +00:00
Glenn Maynard c35c72e64a don't iterate over note rows 2006-11-21 18:21:58 +00:00
Glenn Maynard 056055ce7c simplify 2006-11-21 18:10:20 +00:00
Glenn Maynard eaf69775bb cleanup 2006-11-21 18:09:59 +00:00
Glenn Maynard 6eb5d623b9 cleanup 2006-11-21 18:05:24 +00:00
Glenn Maynard 9fa7a83535 update comments 2006-11-21 17:58:04 +00:00
Glenn Maynard 6276a1f93d play sounds normally 2006-11-21 17:57:06 +00:00