Commit graph

111 commits

Author SHA1 Message Date
Walter Julius Hennecke
0c24562b07 Fixed a bug in g_main.c where an entity was passed to an function insetead of its entity number. 2011-12-06 00:13:56 +01:00
Harry Young
f69ff3a240 Begin of fx-conversion and a minor change to the laser turret
Going to open an issue here.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2011-12-05 23:07:12 +01:00
Harry Young
90125906cb Fixes for misc_laser.
Still need float to transfer alpha-channel from game to cgame

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2011-12-05 19:47:42 +01:00
Walter Julius Hennecke
252a52afdc ... 2011-12-05 17:44:24 +01:00
Harry Young
61947264f6 Merge branch 'master' of git://github.com/UberGames/RPG-X2.git 2011-12-05 17:13:11 +01:00
Harry Young
1fbd9796e2 Buggy fixes for misc_laser-turret
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2011-12-05 17:12:23 +01:00
Walter Julius Hennecke
5c82193457 changes not worth mentioning 2011-12-05 17:04:34 +01:00
Walter Julius Hennecke
b63fa5482f even more fixes 2011-12-05 16:37:03 +01:00
Walter Julius Hennecke
18b101c4b6 Added entity fields startRGBA and endRGBA, minor bugfixes 2011-12-05 11:07:34 +01:00
Walter Julius Hennecke
958501a9e3 Added ToDo.txt files to cgame, game, and ui. 2011-12-05 10:33:40 +01:00
Walter Julius Hennecke
28e548969f same as last commit 2011-12-05 10:15:56 +01:00
Walter Julius Hennecke
70fec391d2 Added missing , in bg_public.h 2011-12-05 09:42:23 +01:00
Harry Young
428e4d1c0b Prep for some additional SP-FX I'm going to try and port.
Also I reintegrated the damage-support for fx_steam and made some 'Means of Death' more fitting.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2011-12-04 22:44:54 +01:00
Harry Young
f7a4f7443c Merge branch 'master' of git://github.com/UberGames/RPG-X2.git 2011-12-03 16:02:18 +01:00
Harry Young
71435c116d Added Disruptor-Effect to fx_phaser
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2011-12-03 15:59:57 +01:00
Walter Hennecke
f34221f03b Code cleanup
Code clean up and C99 to ANSIC comments of game/bg_misc.c
2011-11-24 13:54:54 +01:00
Walter Hennecke
f4ceb2f558 Started work on adding Mac support (non rpgxEF)
Maybe even for rpgxEF if I manage to get rpgxEF compiled for it.
2011-11-22 11:52:50 +01:00
Harry Young
03f2bdfbd0 *Fixes to the Exit-Screen-Strings (Pretty cheap, I know ^^) Needs to be put in the .pak3
*new g_turrets.c with what I've done so far with the Laser. Need sth to get the color done...

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2011-11-16 22:08:30 +01:00
Harry Young
166804ef93 *added Getter and Setter for 'wait'
*updated Borg1 to new Setters and made use of the hooks where possible


Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2011-11-14 23:27:35 +01:00
Harry Young
6e8bfa7963 Okay, here's some:
*fixed the Lua-Hooks so they finally give Entities (g_local.h and g_lua.c)
*excluded a dummy that was causing a compile warning (lua_entity.c)
*Fixed CenterPrint and ClientPrint so they give the Text instead of the Clientnumber

Next I'll try to reactivate the dn1-Laser-Minigame and maybe fix the turrets.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2011-11-14 13:33:07 +01:00
Harry Young
1ffa454382 uploaded a new folder with a not working 'fix' for the lua-hooks. I really have no idea what is causing the crash here.
also readded 1 line of code I accidently removed.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2011-11-09 19:27:26 +01:00
Harry Young
03f3b522cc removed clientnumber frum lua_prints and slimmed them
found the issue that was likely causing the error on the stasis-door (trap_LinkEntity) but now it causes a signal caught.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2011-11-09 00:07:13 +01:00
Harry Young
b81b1875ab Buggy version of a restructured and partly rewritten func_stasis_door
somehow the trigger won't either spawn as anticipated or will not call it's touch-function
i put some debug-notes in the code for orientation

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2011-11-04 20:05:17 +01:00
Harry Young
ffd4e606e8 Fixed game.MessagePrint so it gives Message instead of quiet center print.
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2011-10-31 22:06:57 +01:00
UberGames
1c0613c59a Added target_shaderremap provided by Harry Young
Signed-off-by: UberGames <admin@ubergames.org>
2011-10-17 11:43:14 +02:00
UberGames
e03c490c2f Some fixes ... 2011-08-02 23:56:32 +02:00
UberGames
f10493a98d Some minor fixes... 2011-08-02 13:55:24 +02:00
UberGames
bc4ea34bba Some fixes as well as some recoded functions in lua entity lib. 2011-07-28 18:34:17 +02:00
UberGames
cf0a8dfaea Fixes to some Getters and Setters for lua entity lib as well as a few new getters and setters. 2011-07-28 18:00:52 +02:00
UberGames
aaa362beea Fixes for getter and setter in lua entity library. 2011-07-28 14:14:06 +02:00
UberGames
b3067d177f Fixed Lua Setters for apos1 and apos2. 2011-07-28 13:27:10 +02:00
UberGames
b968dcbd47 All String getters now either return a valid string or nil. 2011-07-28 13:20:12 +02:00
UberGames
c8ae3d00e2 Added some usefull comments... 2011-07-27 14:28:54 +02:00
UberGames
b727fc85ca Same as last ... 2011-07-27 14:12:55 +02:00
UberGames
ca789d1b4a Same as last ... 2011-07-27 13:49:02 +02:00
UberGames
42f36da22d Same as last ^^ 2011-07-26 22:53:46 +02:00
UberGames
5d200c8947 Even more getters and setters... and I'm far from finished xD. 2011-07-26 18:19:18 +02:00
UberGames
ef8ad59929 More getters and setters ... 2011-07-26 15:28:30 +02:00
UberGames
3788108592 More getters and setters for lua entity library. 2011-07-26 14:46:59 +02:00
UberGames
bb98fca47a Bugfixes ... 2011-07-26 13:12:05 +02:00
UberGames
a7ce8bdabb Set maximum number of lua VMs to 3 on game: one for maps, one for lua mods, and one for customizeable weapons (WIP, slow progress).
Started adding a lot of getters and setters to lua entity library.
2011-07-26 13:08:07 +02:00
UberGames
166ef0cad7 Added lua library cvar which allows to get the values of cvars in lua. 2011-07-26 00:02:53 +02:00
UberGames
363aa41389 Merge branch 'master' of github.com:UberGames/RPG-X2 2011-07-25 20:03:18 +02:00
UberGames
af89563973 Added Multithreading to Lua where it made sense. 2011-07-25 20:02:07 +02:00
UberGames
3ca7a1a660 Added forgotten line of modification on target_delay. 2011-07-25 09:37:38 -07:00
UberGames
69de94a8dd Lua now opens the lua coroutines library. 2011-07-24 19:18:27 +02:00
UberGames
93df28e396 Finished lua trace library. Needs testing ... 2011-07-24 13:27:57 +02:00
UberGames
0564166919 Started work on lua library for trace_t.
Started work on lua library for weapons.
2011-07-24 00:29:04 +02:00
UberGames
8af8e25a22 Debugged LUA PlaySound function.
Changed version to "Beta 8.4.7 wc1", Beta 8.4.7 working copy 1.
2011-07-22 22:08:45 +02:00
UberGames
d559a1dc46 Added soundDeactivate to target_turbolift and target_warp. 2011-07-22 11:14:35 +02:00
UberGames
e68e67b8da Modified basic spawn function of func_stasis_door. 2011-07-22 10:59:09 +02:00
UberGames
e304aea758 Added changes to target_levlchange suggested by Harry Young and
fixed a bug in it I discovered by doing so.
Fixed a bug in target_serverchange.
2011-07-22 10:52:53 +02:00
UberGames
2a5e54ae23 Fixed fix for target_delay.
Added a basic spawn function for func_stasis door.
2011-07-20 17:16:10 +02:00
UberGames
e037905d97 Fixed target_delay. 2011-07-20 17:06:50 +02:00
UberGames
ec6287e156 Added modified version of a fix for fx_fountain submitted by Harry Young. Thank you. 2011-07-19 13:59:59 +02:00
UberGames
2a1f7b4263 lol don't know what I fixed/added anymore sorry 2011-07-19 13:51:15 +02:00
UberGames
f5f25895d8 fixed all compile warning in game 2011-06-09 13:31:41 +02:00
UberGames
37b6c87082 fixed all compile warning in cgame 2011-06-09 12:27:51 +02:00
UberGames
c8b40cb31b Removed an obsolete file ... 2011-06-09 00:27:29 +02:00
UberGames
eb2bd43add - fixed game Makefile
- added basic cinematic camera mode (needs much more work until it is finished)
2011-06-09 00:16:25 +02:00
UberGames
bbdc52c075 initial commit 2011-06-01 14:20:56 +02:00