Commit graph

207 commits

Author SHA1 Message Date
Walter Julius Hennecke
f54a709f00 Modified list module and sublicensed it 2013-08-28 19:02:50 +02:00
Walter Julius Hennecke
bfe7d807e4 Test commit to test jenkins build trigger 2013-08-11 02:50:40 +02:00
Walter Julius Hennecke
881aa6e6d3 Update to sqlite 3.7.16.2 2013-05-08 20:49:26 +02:00
Walter Julius Hennecke
6382664a58 Manual merge of devel changes:
- lua function update (partial)
- lua documentation update
- config.ld for LDoc (documentation creation tool for Lua)
2013-04-29 23:50:27 +02:00
Harry Young
c9a8d31f3d More work on admin UI
I had some issues with the standalone Welcome Page so I modified the Login Page to include this and moved the Admin-Check there as well.
I altered the Defines in ui_admin.c and updated on other positions where required so far (I'll adapt the remainder as time comes)
I enabled subfolders for the Music-UI (I don't see why this is a problem at all)
I the Ingame menu I completely disabled the HC-Butttons.
Added Logout-Ability for userlogion (adapted from adminlogin)

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2013-03-20 11:33:29 +01:00
Harry Young
6694f3845f More work on Admin UI
Finished Login UI
Build Welcome UI
Finished Hook
some cleanup

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2013-03-19 13:15:19 +01:00
Harry Young
18e3921d4f First series of mods to Admin UI
Implementet the Relaod-Callvote in Ingame
Build a rudimentary Login system

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2013-03-18 14:36:06 +01:00
Harry Young
cdcd259913 Quickly fixed FS#37 - Self Destruct Function kills when aborted
Turned out i removed that part of the think when I cleaned up stuff
Added a new end-think to remove the entity safely.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2013-03-12 06:11:54 +01:00
StFi
9736433110 Linux Beta 2.3 Fix 2013-03-04 19:52:26 +01:00
Walter Julius Hennecke
e16722e2d2 Finished cleanup and reformating of g_local.h 2013-02-25 22:51:41 +01:00
Walter Julius Hennecke
fed00c7f67 Cleanup and reformatting of some structs in g_local.h 2013-02-25 13:23:30 +01:00
Walter Julius Hennecke
fd6e6fca30 Fix for FS#29
Fix for FS#29 - Server Change on ui_transporter seems broken
2013-02-25 12:15:53 +01:00
Harry Young
6ee97b6843 definition-Fixes
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2013-02-24 14:20:59 +01:00
Harry Young
5e6d26aeda Some minor fixes
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2013-02-21 21:51:34 +01:00
Walter Hennecke
2ffffcd6e4 Bug fixes to list module 2013-02-13 11:57:18 +01:00
Harry Young
c496a24d57 Added Safezone-Turnoff back in and did some more cleanup
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2013-02-11 06:21:55 +01:00
Harry Young
3164fdfa33 A lot of stuff!
-replaced target_safezone with target_sone (backwardscompability is in place)
--It now servers for more purposes than just escapepods. Also included in the MSD-System

-Removed list-iteration for safezones.
--They gave me such a hard time and put unneeded limits in place (like one time shots)
--now we loop trough all entities instead and find those with the right criteria and go from there

-For safezones clients are now tagged in the backend (new gclients_t-field)
--only those that aren't taggesd this way will be killed
--Closed FS#30

-First version of shiphealth HUD (FS#8, needs testing)
--There were som modifications made to the full UI as well

-Both Selfdestruct and Shiphealth communication to the client go via command now, the events got removed
-new Version Notation: RPG-X V 2.3 CB 4

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2013-02-10 00:31:04 +01:00
Harry Young
3797e35c61 Added target reset to MMB-Repair and made some mods to prevent multi-resetting
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2013-01-13 22:02:59 +01:00
Harry Young
76c0d8fea6 More work on torpedo relaod command
should be finished now

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2013-01-12 17:20:27 +01:00
Harry Young
c2e135da16 Added reloadtorpedos-command and som fixes for weapon-fx
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2013-01-12 02:33:04 +01:00
Harry Young
f3f7345ccd Minor fixes to selfdestruct + audio for terminal count
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2013-01-09 19:27:36 +01:00
Harry Young
ec431c010a Finished work on selfdestruct
Countdown Clock is working
Overall script is working again
removed some unused stuff
added a few more failsafes
did some finetuning

sometimes the sounds don't trigger but I don't think that is my fault...

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2013-01-08 13:54:13 +01:00
Walter Julius Hennecke
b99a372ff1 Removed ...
* g_teamautojoin
* g_teamforcebalance
2012-12-22 19:15:53 +01:00
Walter Julius Hennecke
0e4ac8e9e6 Removed g_friendlyfire as there are no teams in RPG-X 2012-12-22 19:13:45 +01:00
Walter Julius Hennecke
b5a5a4a4d8 Fix for FS#27 - No Weapon Damage 2012-12-22 19:12:00 +01:00
Harry Young
0cff0dec5a Merge branch 'master' of git@github.com:UberGames/rpgxEF.git 2012-12-21 11:16:43 +01:00
Harry Young
fe6a0f4b7c Removed some unneeded stuff from selfdestruct
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-12-21 11:16:30 +01:00
Walter Julius Hennecke
62f54b070e Continued work on slq login menu
* note: new graphics not uploaded yet
2012-12-20 22:46:38 +01:00
Walter Julius Hennecke
9101ad9a3b Added temporary command sqlmenu to the client ...
... to make designing it easier.
2012-12-20 00:35:30 +01:00
Walter Julius Hennecke
8f345fbfde Udate to precache files
* updated precache file format
* prevention of duplicate shaders in file generated with the
genPrecacheFile command
2012-12-18 19:02:33 +01:00
Walter Julius Hennecke
a1d826d8fe Some additions
* Fixed precaching on client side
* added generatePrecacheFile command on server side that will generate a
new precache file (not quite done yet but it'll work for now)
* removed some debuging outputs from G_LoadTimedMessages
* fixed check for '}' beeing on the worng place in G_LoadTimedMessages
2012-12-17 19:13:46 +01:00
Walter Julius Hennecke
f776fdf3e3 Added command that generates a .precache file for a map 2012-12-14 20:47:08 +01:00
Walter Julius Hennecke
039985bd27 Added preaching for shader remaping (needs testing) 2012-12-13 17:40:07 +01:00
Walter Julius Hennecke
80d8eab4c9 Some mods for target_turbolift
- added override key to allow mappers to override "override"
rpg_calcLiftTravelDuration
2012-12-13 16:31:11 +01:00
Walter Julius Hennecke
a57b6979d6 Fix for FS#26 - Turbolift UI not showing
Fix for FS#26 - Turbolift UI not showing
2012-12-12 16:19:02 +01:00
Walter Julius Hennecke
e03714e3a1 Started work on sql login ui ...
... got a bit bored doing it though so there is not much done yet ...
2012-12-10 23:18:30 +01:00
Walter Julius Hennecke
c4f33a82e0 minor fixes 2012-12-10 23:05:57 +01:00
Walter Julius Hennecke
7bd0864a2d Implemented FS#24 2012-12-09 01:52:36 +01:00
Walter Julius Hennecke
a013c95957 Task FS#4 and Fix
- Implemented Task FS#4
- added a missing } in g_cmds.c
2012-12-09 01:40:02 +01:00
Walter Julius Hennecke
b0a419857a added possibility to lock fx_torpedo and fx_phaser
FS#15
2012-12-09 01:32:55 +01:00
Walter Julius Hennecke
c581e36163 Backward compability for target_give and older classets 2012-12-09 01:23:19 +01:00
Harry Young
e1ab15c57f Merge branch 'master' of git@github.com:UberGames/rpgxEF.git 2012-12-08 10:54:51 +01:00
Harry Young
76f66aa58a removed some stuff from g_cmd (selfdestruct)
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-12-08 10:54:36 +01:00
Walter Julius Hennecke
11d133b693 Added licenses for luaDefParser and entityDefParser 2012-12-08 00:48:25 +01:00
Walter Julius Hennecke
1efd4b40fa Moved luaDefParser and entityDefParser to a new location 2012-12-08 00:38:21 +01:00
Harry Young
c09f67dfd6 Forgot to clean up some stuff
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-12-07 00:15:45 +01:00
Harry Young
29d9180afa Removed stuff from selfdestruct that is no longer required.
did a few other tests and it really only is the communication between server and client.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-12-07 00:10:15 +01:00
Harry Young
65282c20a2 Merge branch 'master' of git@github.com:UberGames/rpgxEF.git 2012-12-06 15:52:51 +01:00
Harry Young
cc4b48e8fa Started to add HUD-Element for Selfdestruct, however...
there seems to be an issue with the way I selected to transfer the countdown duration to the client (via event)
In server side Execution I run by the g_addevent just fine, however on the client side the event is not called.

there is also a new definition for trigger_airlock.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-12-06 15:52:34 +01:00
Walter Hennecke
522b00756f export functions for lyx (WIP) 2012-12-06 09:37:27 +01:00
Walter Hennecke
1abb89ff21 Minor changes to the lua function definitions lexer 2012-12-04 15:14:40 +01:00
Harry Young
1953cfaa25 Merge branch 'master' of git@github.com:UberGames/rpgxEF.git 2012-12-04 00:43:07 +01:00
Harry Young
5d2ecf6520 A few fixes for shiphealth stuff
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-12-04 00:43:04 +01:00
Walter Julius Hennecke
3d4ee1c97e Update entityDefParser and added luaDefParser (WIP)
* README of entityDefParser now contains build instructions for linux,
mac, and windows
* added first version of luaDefParser (for now it just lexes the file
and outputs what it found. In future I want it to output a lyx file)
2012-11-30 12:29:10 +01:00
Walter Hennecke
e97c97d5d3 Added tool that reads entity definitons into a file 2012-11-29 10:17:28 +01:00
Harry Young
75ec1fce7b Finished work on entity definitions update!
On the way merged target_postiton with info_notnull
Also added a failsafe to target_selfdestruct so it can only be commandspawned

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-27 22:57:55 +01:00
Harry Young
fc08de6e3d finished up descriptions in g_misc and g_mover
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-27 10:37:48 +01:00
Harry Young
8e3023c613 more work on definitions
Added a few comments on the way.
remmoved files for func_forcefiled2 and func_roff_mover as they were absolutely never used and were not included in any makefile.
collapsed some functions that were redundant to each other

did some work on misc_portal_camers/surface (untested)
did some very needed updates to the descriptions
redesigned the spawning and initialising of the surface in that it now has a few more failsafes
Added the ability to pause autocycle

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-27 03:04:09 +01:00
Walter Julius Hennecke
460b7da012 Update code/game/lua_mover.c
Added an example for a parseable comment describing a Lua function (mover.AsTrain).
Add some point all comments should look like this. I'm writing a program that'll parse them and convert them into latex.
2012-11-26 11:24:22 +01:00
Harry Young
5500407c65 Finished first version of ui_msd
UI displays status of all systems connected to it's parent target-shiphealth
There is also a slide for relative health
It does not auto update.

Up next I'll try the HUD-Element.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-23 22:56:39 +01:00
Harry Young
8e9348d463 forgot to commit there
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-23 00:12:50 +01:00
Harry Young
940469a4ce Work on MSD-UI
*Fixed Communication between server and UI
-Turned out the CG_Argv() and UI_Argv() couldn't handle 9 requests at once, so I defaulted back to direct trapping.
*Fixed bug that was looking for some Vars in the wrong fields.
*Added a few new shaders to get the alert lights to work. stuff for that will be uploaded tomorrow.
*Implemented alert lights on the MSD-UI (works perfectly)

*Added Description of a new feature to target_shiphealth (Custom MSD-Ship Display)
*Added Alexander Richardson as 2D Artist to credits (I will supply his MSD's for the new system)

*Fixed ui_transporter (It accidently got killed)

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-23 00:12:20 +01:00
Harry Young
63e3ed0928 Started to work on a full Master Systems Display UI
For Head Start I ripped the Transporter UI and associated entities

I have already started to work on it's first display function, the Alert Condition,
however it seems that I am losing my int's somewhere on the path,
probably on handover between cgame and ui sections (ui_atoms.c)

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-20 22:26:46 +01:00
Harry Young
e416f650ea Fix works so I discontinued and removed the borg elevator an the lua debug file
I'm going to make a release of this version for CB now

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-19 19:28:49 +01:00
Walter Julius Hennecke
75f20c6eef Multiple fixes
* made sure Lua GarbageCollector gets rid of finished lua threads (or at
least I hope so)
* changed timed message to be stored in a struct as the list isn't safe
to use with char*
* changed parser and format for timedmessages.cfg
2012-11-19 18:13:03 +01:00
Harry Young
94ffb3ea61 torned think on borg_elevator back off so we can do a beta-release with this.
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-18 01:27:25 +01:00
Harry Young
9d9fff392b Fixed crash, however the entity behaves weired...
added lua-debug-folder to communicate lua-files for debugging via this repo.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-16 13:54:10 +01:00
Harry Young
f1faa5dfa6 Fixed upper->count and g_CallSpawn
Count-values were 0, 1, 2, 3, 4 but shall be 1, 2, 3, 4, 5

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-16 02:36:59 +01:00
Harry Young
404b94b520 Definitions and borg2-elevator
Updated more definitions
Started to work on an entity that manages the 2-part-elevator
Spawnfunc on that works fine (including failsafes)
but thinkfunc buggs out on me (can't say I'm surprised, first time I'm working on trajectories in this way)
I think the problem lies in transfering the hardcoded vectorized speed to the entity.

spawn-nextthink is set to -1 for now.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-16 02:10:01 +01:00
Walter Julius Hennecke
4c1a8d0910 Renamed and moved some functions 2012-11-16 00:58:56 +01:00
Walter Julius Hennecke
b6feda9b2b Renamed and moved RPG-X related g_team.c functions to g_client.c 2012-11-16 00:02:59 +01:00
Walter Julius Hennecke
35303ecc8c Removed the rest of unused team stuff 2012-11-15 23:49:35 +01:00
Walter Julius Hennecke
db0df99793 Removed lots of things
Removed all unused things from g_team.c and related things
2012-11-15 23:43:56 +01:00
Walter Julius Hennecke
973b0e2211 Removes and fixes
* fixed typo in lua_qmath
* removed target_score
* removed some unused stuff from g_team.c (still lots more to remove)
2012-11-15 22:51:47 +01:00
Harry Young
e561731baa More work on definitions.
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-15 06:41:12 +01:00
Harry Young
b18acbbd93 readded crandom
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-14 10:11:51 +01:00
Harry Young
c69d5f03b6 Forgot this file...
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-14 10:09:50 +01:00
Harry Young
b9b61d2955 3 new lua-functions and updated definitions.
*entity.FindMMB(vector origin) that will loop trougt all MMB's and return the one that is matching the input with it's s.origin
*qmath.irandom(int i, int j) and qmath.flrandom(float i, float j) that are returning a random number of their type within the intervall specified by i and j
*started redesigning all the definitions. I'll get back to this once I'm back from work in 4 hrs or so.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-14 10:09:28 +01:00
Harry Young
be557e0052 Bugfix for ui_transporter-stuff
Im my desire to make sure every command was adminprotected I killed the commands communicating with the trigger...
I reverted that and added SQLF_BEAM as a check for restricted destination clearance

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-14 02:45:46 +01:00
Walter Julius Hennecke
0f9ef785f5 Workaround for func_breakables without origin brush
* added lua function SetAngles2 to mover lib
* Added work around for func_breakables without origin brush
* Set angles2 to origin (note determin in Radiant)
* Set n00bcount to approx radius of the entity
* add spawnflag NOORIGIN (512)
2012-11-13 19:39:44 +01:00
Walter Julius Hennecke
71d607d39f Fix for scoreboard 2012-11-13 19:00:08 +01:00
Harry Young
a110797862 Added repairability to MMBRefit
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-13 17:23:43 +01:00
Walter Julius Hennecke
f4e8476e8f modified getOrigin command for better output 2012-11-13 14:35:09 +01:00
Walter Hennecke
0f99d23ae0 Added new TODO 2012-11-13 09:58:15 +01:00
Walter Hennecke
f5fad5b3e8 Trying to fix setting of origins for brush ents without origin brush
Not tested yet ...
2012-11-13 09:54:11 +01:00
Walter Julius Hennecke
6fdbc08b04 Added missing files to project 2012-11-13 00:49:02 +01:00
Walter Julius Hennecke
8275080a34 Removed some gametype specific stuff from cgame
Wasn't used in RPG-X anyway as gametype is always 0 for RPG-X.
2012-11-13 00:47:12 +01:00
Walter Julius Hennecke
24a1b7c062 cleanup g_svcmds.c, g_syscalls.c, g_target.c 2012-11-12 22:02:07 +01:00
Walter Julius Hennecke
e2039624a1 cleanup and fixes
* cleanup g_session.c, g_spawn.c, g_sql.c
* fixed errors in md5 implementation
2012-11-12 21:53:18 +01:00
Walter Julius Hennecke
e57e8d9d27 Cleanup and more
* cleanup: g_missile.c, g_mover.c
* modified list to allow list->destructor to be NULL
2012-11-12 21:33:22 +01:00
Walter Julius Hennecke
e2dfbeec15 Added repair support for misc_model_breakable 2012-11-12 15:09:10 +01:00
Walter Julius Hennecke
32d2c4c077 Cleanup g_misc.c 2012-11-12 12:42:22 +01:00
Walter Julius Hennecke
35f67c3b88 Cleanup g_main.c 2012-11-12 00:05:34 +01:00
Walter Julius Hennecke
a4344295b9 Cleanup g_items.c, g_log.c, g_lua.c 2012-11-11 23:11:37 +01:00
Walter Julius Hennecke
5719413ea4 Cleanup g_fx.c 2012-11-11 23:04:39 +01:00
Walter Julius Hennecke
26631cb58d Cleanup g_combat.c 2012-11-11 22:53:27 +01:00
Walter Julius Hennecke
bc1558b36c Cleanup g_cmds.c 2012-11-11 22:41:22 +01:00
Walter Julius Hennecke
69335bc840 Cleanup g_breakable.c and g_client.c 2012-11-11 18:33:50 +01:00
Walter Julius Hennecke
db993026e3 Cleanup g_active.c
* removed long blocks of commented code
* removed old/unused code
* made functions static where possible
2012-11-11 18:14:20 +01:00
Walter Julius Hennecke
c655f7c5ac See description ...
* Combined several cvars into single cvars
* removed some unsused cvars
2012-11-11 16:54:49 +01:00