Commit Graph

337 Commits

Author SHA1 Message Date
Walter Julius Hennecke 0280e4d242 fixed more warnings 2013-05-24 22:43:32 +02:00
Walter Julius Hennecke 6c61039198 fixed warnings 2013-05-24 22:36:09 +02:00
Walter Julius Hennecke 063a4cabcf same as last 2013-05-24 22:27:00 +02:00
Walter Julius Hennecke 2c91fb8df7 fixed warnings 2013-05-24 22:25:14 +02:00
Walter Julius Hennecke d15d902aaa fixed warning 2013-05-24 22:19:39 +02:00
Walter Julius Hennecke d5833a11ce fixed annotation 2013-05-24 22:18:12 +02:00
Walter Julius Hennecke 4186173798 fixed annotation 2013-05-24 22:13:38 +02:00
Walter Julius Hennecke decb2bdf52 annotations and fixes 2013-05-24 22:11:53 +02:00
Walter Julius Hennecke 263c803e5a more annotations 2013-05-24 20:55:00 +02:00
Walter Julius Hennecke a81359153b more annotations 2013-05-24 20:48:37 +02:00
Walter Julius Hennecke cc41dcdcd1 added annotations 2013-05-24 19:36:05 +02:00
Walter Julius Hennecke eb7e630a8c ... 2013-05-24 19:33:04 +02:00
Walter Julius Hennecke 008bd777c0 ... 2013-05-24 19:31:09 +02:00
Walter Julius Hennecke 9398418f9a fixed warning 2013-05-24 00:05:46 +02:00
Walter Julius Hennecke fc47c4eb97 fixed more warnings 2013-05-24 00:04:19 +02:00
Walter Julius Hennecke 596ab8be01 fixed several warnings 2013-05-23 23:58:15 +02:00
Walter Julius Hennecke f6cafeb599 fix warning 2013-05-23 23:46:34 +02:00
Walter Julius Hennecke 8a92368405 more annotations added 2013-05-23 23:44:50 +02:00
Walter Julius Hennecke 5dd3e5f304 ... 2013-05-23 23:41:41 +02:00
Walter Julius Hennecke 4627b762c5 ... 2013-05-23 23:39:29 +02:00
Walter Julius Hennecke 8bcd4bb291 ... 2013-05-23 23:33:03 +02:00
Walter Julius Hennecke cb9341e599 annotated functionf for splint 2013-05-23 23:22:26 +02:00
Walter Julius Hennecke 8add184264 more fixes 2013-05-21 21:43:48 +02:00
Walter Julius Hennecke f197b409ad fixed more warnings 2013-05-21 21:39:14 +02:00
Walter Julius Hennecke 722ababa8b ... 2013-05-21 21:21:47 +02:00
Walter Julius Hennecke 524a5a4bde ... 2013-05-21 21:12:26 +02:00
Walter Julius Hennecke 19b9d0669c fixed parse error 2013-05-21 21:08:36 +02:00
Walter Julius Hennecke 3a90f52947 fixed parse error 2013-05-21 21:06:59 +02:00
Walter Julius Hennecke c5e13d0557 Fixed multiple splint warnings 2013-05-21 20:57:26 +02:00
Walter Julius Hennecke caf8ae371a Fixed two splint warnings 2013-05-21 20:49:19 +02:00
Walter Julius Hennecke 8cd58f3bb1 ... 2013-05-21 20:43:07 +02:00
Walter Julius Hennecke 6d114b78cb ...# 2013-05-17 22:35:26 +02:00
Walter Julius Hennecke c0c4ceb0a9 no comment :/ 2013-05-17 22:31:07 +02:00
Walter Julius Hennecke 489f1dc772 one last thing to try :/ 2013-05-17 22:26:57 +02:00
Walter Julius Hennecke d74be3d6a9 lol well lets try this 2013-05-17 22:23:03 +02:00
Walter Julius Hennecke dc645631e4 nope ... this one is getting annoying 2013-05-17 21:49:58 +02:00
Walter Julius Hennecke 0d03a3e109 that didn't work ... how about this? 2013-05-17 21:45:48 +02:00
Walter Julius Hennecke 91acc1a05e testing if this works 2013-05-17 21:41:35 +02:00
Walter Julius Hennecke fe3e5d419c more fixes 2013-05-17 21:33:49 +02:00
Walter Julius Hennecke 86109411f9 fixed more splint warnings in g_main.c 2013-05-17 21:21:43 +02:00
Walter Julius Hennecke 3e93946d0b splint warning fixed in g_main.c 2013-05-17 20:46:51 +02:00
Walter Julius Hennecke cf7a1fe666 removed stray ; 2013-05-17 20:22:08 +02:00
Walter Julius Hennecke 6ac94b3609 added missing include 2013-05-17 19:59:33 +02:00
Walter Julius Hennecke c0f3125d38 Hopefully fixes some splint warnings 2013-05-17 19:57:12 +02:00
Walter Julius Hennecke 3ade06cffd Tried to fix some more splint warnings 2013-05-17 00:59:20 +02:00
Walter Julius Hennecke 555cb0d5cf minor fix 2013-05-17 00:42:09 +02:00
Walter Julius Hennecke 8eec843cbc minor fix 2013-05-17 00:41:02 +02:00
Walter Julius Hennecke e95593b350 ... 2013-05-17 00:29:07 +02:00
Walter Julius Hennecke 4fe74b8fdf fix for SetClass 2013-05-17 00:23:03 +02:00
Walter Julius Hennecke 2a16df527b more fixes 2013-05-16 23:54:40 +02:00
Walter Julius Hennecke 0861620c2e more minor fixes 2013-05-16 23:30:37 +02:00
Walter Julius Hennecke 76f385eaf8 minor fixes 2013-05-16 23:26:16 +02:00
Walter Julius Hennecke d3bd8eaf79 Changed G_LoadServerChangeFile from fixed buffer size to dynamic buffer size 2013-05-16 22:05:18 +02:00
Walter Julius Hennecke 02b60d67ca modified misc_model_breakable to allow use of custom damage models via model2 2013-05-16 22:01:40 +02:00
Walter Julius Hennecke dc3f69b166 Lua documentation and function update 2013-05-10 20:39:46 +02:00
Walter Julius Hennecke 99aa43a25d Lua documentation and function update 2013-05-10 00:07:14 +02:00
Walter Julius Hennecke 4b4fd3c470 Updated lua documentation. 2013-05-09 19:40:15 +02:00
Walter Julius Hennecke e887081261 Code reformating 2013-05-09 01:59:07 +02:00
Walter Julius Hennecke 9eb592fb58 Updated lua functions and lua documentation ...
ATTENTION PLEASE NOTE THAT THE FOLLOWING LUA FUNCTIONS HAVE CHANGED:
vector.Set(vec,x,y,z) -> vector:Set(x,y,z)
vector.Length(vec) -> vector:Length()
vector.Normalize(vec) -> vector:Normalize()
vector.NormalizeFast(vec) -> vector:NormalizeFast()
vector.Add(a, b, result) -> vector:Add(b) returning result
vector.Subtract(a, b, result) -> vector:Subtract(b) returning result
vector.Scale(a, scale_factor, result) ->  vector:Scale(scale_factor)
returning result
vector.Clear(vec) -> vector:Clear()
YOU MIGHT HAVE TO ADJUST YOUR LUA CODE ACORDINGLY!
2013-05-09 01:32:38 +02:00
Walter Julius Hennecke 14543ce918 Update to sqlite 3.7.16.2 2013-05-08 20:48:04 +02:00
Walter Julius Hennecke 8cf010bef4 Lua documentation update and config.ld for LDoc 2013-04-29 23:45:53 +02:00
Walter Julius Hennecke 2d32fcecba Added true and false to bgLex
bgLex no recognized true (LSYM_TRUE) and false (LSYM_FALSE)
2013-04-28 19:29:44 +02:00
Walter Julius Hennecke 60ed122ce0 Fixes and modifications ...
- multiple fixes to bgLex
- G_LoadLocationsFile is now using bgLex instead of com_parse:
- this also allows LocationsList version 1 and 2 features to be mixed in
a location file
2013-04-28 19:22:27 +02:00
Walter Julius Hennecke 77e7c1e257 Changed G_LoadServerChangeFile from com_parse to bgLex 2013-04-28 16:52:26 +02:00
Walter Julius Hennecke 0ffd645be9 Modified bgLex_lex to return morphem type 2013-04-28 15:52:52 +02:00
Walter Julius Hennecke d025f55c2a Fix
- added missing return
2013-04-28 02:04:07 +02:00
Walter Julius Hennecke 5c3773a902 Modified lexer to automatically skip LMT_IGNORE 2013-04-28 01:59:14 +02:00
Walter Julius Hennecke fc9bfc84a8 Fix and replacement
- fixed bug concerning lexed strings
- replaced COM_Parse by bgLex for timed messages
2013-04-28 01:27:32 +02:00
Walter Julius Hennecke d4dbfaec23 ... 2013-04-27 23:32:21 +02:00
Walter Julius Hennecke 3b23bfa353 Fixes to the lexer 2013-04-27 22:34:01 +02:00
Walter Julius Hennecke c660ee1a0f Fix and removel of deprecated files
- fixed bg_lex so the lexer compile on mingw
- removed old Makefile of RPG-X as they are deprecated, use "make
BUILD_SERVER=0 BUILD_CLIENT=0" in the repositories main path instead to
build shared libraries only
2013-04-27 19:08:54 +02:00
Walter Julius Hennecke 0a6b8f9e41 Added flex based lexer
- not ready to be used yet as not added to Makefile yet
- reentrant so it could be used for parrallel lexing
2013-04-27 17:56:57 +02:00
Walter Julius Hennecke 9b0c16d7ba Startet work on a lexer to replace COM_Parse 2013-04-22 21:41:34 +02:00
Walter Julius Hennecke 84c0c58eb4 Merge remote-tracking branch 'origin/devel' into locations 2013-04-20 23:16:13 +02:00
Walter Julius Hennecke d4a70f2778 Documentation update 2013-04-20 23:15:25 +02:00
Walter Julius Hennecke f080a0498e rpg_timedMessageTime is not 0 by default 2013-04-17 07:02:11 +02:00
Walter Julius Hennecke 52b278f3af Merge remote-tracking branch 'origin/list' into locations 2013-04-14 22:55:28 +02:00
Walter Julius Hennecke 398c0fade9 Added list_remove_at function ...
... that removes the list element at the given index.
2013-04-14 22:54:40 +02:00
Walter Julius Hennecke d5691391fb Updated list module 2013-04-14 22:34:29 +02:00
Walter Julius Hennecke 32780190c4 Merge remote-tracking branch 'origin/devel' into locations 2013-04-13 23:43:54 +02:00
Walter Julius Hennecke 286257c535 Updated VisualStudio Project 2013-04-13 23:43:12 +02:00
Walter Julius Hennecke 45234efcd7 Merge remote-tracking branch 'origin/devel' into locations 2013-04-13 23:25:06 +02:00
Walter Julius Hennecke 7b0d0ec650 Update Lua 5.2 -> Lua 5.2.2 2013-04-13 23:24:24 +02:00
Walter Julius Hennecke 625d7e4b46 Merge remote-tracking branch 'origin/devel' into locations 2013-04-13 22:32:02 +02:00
Walter Julius Hennecke e253efce63 Updated lua functions 2013-04-13 22:30:58 +02:00
Walter Julius Hennecke ae4e2ade81 Merge remote-tracking branch 'origin/devel' into locations 2013-04-13 22:10:46 +02:00
Walter Julius Hennecke c989308ace Updated lua functions 2013-04-13 22:09:41 +02:00
Walter Julius Hennecke 13c5c5aaa0 Updated lua functions 2013-04-13 20:33:23 +02:00
Walter Julius Hennecke 07d0310b3f Updated some lua functions 2013-04-13 18:48:32 +02:00
Walter Julius Hennecke 0e2a8a30f8 Merge remote-tracking branch 'origin/devel' into locations 2013-04-13 02:32:28 +02:00
Walter Julius Hennecke 42820d681f Updated some lua functions 2013-04-13 02:31:45 +02:00
Walter Julius Hennecke 1e8e349d2b Fixes resulting from code analysis 2013-04-13 01:34:37 +02:00
Walter Julius Hennecke 64a8d2a026 Fixes and additions
- minor fixes
- added missing files to VisualStudio project
2013-04-13 00:50:57 +02:00
Walter Julius Hennecke 15e25117a7 Merge remote-tracking branch 'origin/list' into locations 2013-04-12 23:53:31 +02:00
Walter Julius Hennecke 1a66b0f08b Added list_at function 2013-04-12 23:52:21 +02:00
Walter Julius Hennecke e6c5acd221 Merge remote-tracking branch 'origin/devel' into locations 2013-04-12 23:27:45 +02:00
Walter Julius Hennecke ae24153bb5 Big documentation update 2013-04-12 23:26:59 +02:00
Walter Julius Hennecke 063f85b6a7 Merge remote-tracking branch 'origin/list' into locations 2013-04-12 21:05:46 +02:00
Walter Julius Hennecke f144ae5f11 Multiple changes
- added additonal documentation
- modified G_GetEntityByTargetname to use list
- modified G_GetEntityByTarget to use list
- modified G_GetEntityByBmodel to use list
2013-04-11 22:10:45 +02:00
Walter Julius Hennecke 4e08198ead See extented description ...
- modified G_RadiusList to use lists
- modified G_GetNearestEnt to use lists
- modified G_GetNearestPlayer to use lists
2013-04-11 21:50:28 +02:00
Walter Julius Hennecke 911670539a Merge remote-tracking branch 'origin/list' into locations 2013-04-10 23:04:05 +02:00
Walter Julius Hennecke e41a75403f See extended description
- modified G_RadiusListOfTypes
- added list_init
- modified list_remove
- updated list documentation
2013-04-10 23:03:13 +02:00
Walter Julius Hennecke 2f0bf79e77 Merge remote-tracking branch 'origin/list' into locations 2013-04-10 21:44:50 +02:00
Walter Julius Hennecke 9dbeae534d Documentation update ... 2013-04-10 21:44:02 +02:00
Walter Julius Hennecke cad3ef6ac3 Documentation update ... 2013-04-10 21:43:20 +02:00
Walter Julius Hennecke a84ed32ce4 Merge remote-tracking branch 'origin/devel' into locations 2013-04-09 23:32:01 +02:00
Walter Julius Hennecke 194a6d9ca2 Corrected a comment 2013-04-09 23:30:57 +02:00
Walter Julius Hennecke d6ac2db43b Merge remote-tracking branch 'origin/list' into locations 2013-04-09 23:23:43 +02:00
Walter Julius Hennecke ece161e04a Multiple changes (list module related)
- G_RadiusListOfTypes now uses list instead of entity pointer array
- added list_clear function
2013-04-09 23:22:47 +02:00
Walter Julius Hennecke b334114ae2 Merge remote-tracking branch 'origin/list' into locations 2013-04-09 22:43:20 +02:00
Walter Julius Hennecke 214cf3fc47 Multiple changes
- updated documentation
- corrected data type for two list_append calls
2013-04-09 22:40:50 +02:00
Walter Julius Hennecke 4a14f2a9fa Added possibility to add pointers to lists 2013-04-09 22:27:38 +02:00
Walter Julius Hennecke 2bb9e590ce Merge remote-tracking branch 'origin/list' into locations 2013-04-09 22:10:20 +02:00
Walter Julius Hennecke f35bd7ec1d Modified some code due to use of container ...
The list now can store C types and and strings directly (without the
need of them to be in a struct).
2013-04-09 22:09:29 +02:00
Walter Julius Hennecke a49058ba98 Added type for level locations 2013-04-07 00:57:36 +02:00
Walter Julius Hennecke f8d1bd2419 Bugfix
Added a missing malloc
2013-04-07 00:06:08 +02:00
Walter Julius Hennecke b58d94864d Added addtional functions ...
- added list_append
- added list_prepend
2013-04-06 22:42:06 +02:00
Walter Julius Hennecke afe3614b2a Modified list module and sublicensed it 2013-04-06 22:27:08 +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 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 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 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 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 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