4326 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Olivier Gagnon	c0420d1787	merge dev	2021-10-16 15:46:25 -04:00
hydroflame	961904d177	Merge pull request #1528 from danielyxie/dev ... fix bug with workForFaction	2021-10-16 15:43:53 -04:00
Olivier Gagnon	84a1d27b9a	fix bug with workForFaction	2021-10-16 15:43:28 -04:00
hydroflame	bb95cda256	Merge pull request #1527 from danielyxie/dev ... Fix working for the CIA #1526	2021-10-16 12:20:08 -04:00
Olivier Gagnon	99c75baea0	Fix working for the CIA	2021-10-16 12:19:53 -04:00
Olivier Gagnon	3e3aa1a0fe	merge dev	2021-10-15 21:39:53 -04:00
hydroflame	13a3a136dc	Merge pull request #1523 from danielyxie/dev ... more improvements.	2021-10-15 21:30:01 -04:00
Olivier Gagnon	371d41b7c3	added placeholder for filename	2021-10-15 21:28:17 -04:00
Olivier Gagnon	02b085cc75	script editor now saves on server that opened the file and displays server name	2021-10-15 21:27:02 -04:00
Olivier Gagnon	e38bfc70cf	remove unused export	2021-10-15 21:04:17 -04:00
Olivier Gagnon	52a96b94f9	fix cancel penalty for company servers	2021-10-15 21:03:25 -04:00
Olivier Gagnon	73b9cae203	logbox title isn't infinitely long anymore	2021-10-15 20:59:16 -04:00
hydroflame	de0d876638	Merge pull request #1521 from danielyxie/dev ... fix exploit that enabled IPC	2021-10-15 20:50:31 -04:00
Olivier Gagnon	30588a885b	make succes toast brighter	2021-10-15 20:50:16 -04:00
Olivier Gagnon	45c46ce2a0	fix exploit that enabled IPC	2021-10-15 19:13:05 -04:00
hydroflame	845887a7b8	Merge pull request #1520 from danielyxie/dev ... Fix blade not being able to start Incite Violence	2021-10-15 19:08:31 -04:00
Olivier Gagnon	58650c5895	Fix blade not being able to start Incite Violence	2021-10-15 19:08:21 -04:00
hydroflame	88997f564b	Merge pull request #1518 from danielyxie/dev ... Incite Violence doubles chaos	2021-10-15 19:04:57 -04:00
Olivier Gagnon	09f621e342	Incite Violence doubles chaos	2021-10-15 19:04:44 -04:00
hydroflame	b6157e6851	Merge pull request #1517 from danielyxie/dev ... improve monokai again	2021-10-15 18:58:55 -04:00
Olivier Gagnon	762e7f127c	improve monokai again	2021-10-15 18:58:10 -04:00
hydroflame	85c33fc0b5	Merge pull request #1516 from danielyxie/dev ... Fixed folder adding space during autocomplete.	2021-10-15 18:33:46 -04:00
Olivier Gagnon	d6ea9c55b1	fixed folder adding space in autocom	2021-10-15 18:33:27 -04:00
Olivier Gagnon	34fa906013	save some text editor notes	2021-10-15 18:27:02 -04:00
hydroflame	d4086bf467	Merge pull request #1515 from danielyxie/dev ... improve monokai by making the language a superset of javascript	2021-10-15 18:25:37 -04:00
Olivier Gagnon	80d197652d	improve monokai by making the language a superset of javascript	2021-10-15 18:25:22 -04:00
tyasuh.taeragan@gmail.com	12f61677e3	Issues 1508 and 1506	2021-10-15 17:26:26 -04:00
hydroflame	57ab4a029e	Merge pull request #1512 from danielyxie/dev ... Improve text editor height	2021-10-15 16:16:30 -04:00
Olivier Gagnon	b5a8ed1d9d	improve script editor display	2021-10-15 16:16:11 -04:00
Olivier Gagnon	e047653ed7	improve text editor scaling	2021-10-15 16:14:27 -04:00
hydroflame	f3d9cd9964	Merge pull request #1511 from danielyxie/dev ... script editor save button more often on screen.	2021-10-15 15:48:41 -04:00
Olivier Gagnon	f645d08a50	small screen script editor	2021-10-15 15:47:17 -04:00
Olivier Gagnon	dbc77f6f0e	nerf some shapes	2021-10-15 15:40:19 -04:00
Olivier Gagnon	d2f2ab07d7	merge dev	2021-10-15 15:13:48 -04:00
Olivier Gagnon	515f9e5d4b	fixed layer til the end of time	2021-10-15 14:16:30 -04:00
Olivier Gagnon	5e9143371a	comment	2021-10-15 14:05:56 -04:00
Olivier Gagnon	536b8360cf	small improvement to lgobox layer	2021-10-15 14:04:42 -04:00
hydroflame	2e203d46ff	Merge pull request #1505 from danielyxie/dev ... logbox layer on click	2021-10-15 13:59:51 -04:00
Olivier Gagnon	8b59260bd3	logbox layer on click	2021-10-15 13:59:42 -04:00
hydroflame	3d0c76b81b	Merge pull request #1504 from danielyxie/dev ... @hydroflame logbox window z index fix	2021-10-15 13:49:25 -04:00
Olivier Gagnon	3bd05ea398	logbox window z index fix	2021-10-15 13:49:03 -04:00
Olivier Gagnon	79a6c7eb7b	logbox uses class to identify drag handle instead of id.	2021-10-15 13:24:00 -04:00
hydroflame	4ae5811afa	Merge pull request #1503 from danielyxie/dev ... doc typo	2021-10-15 13:19:25 -04:00
Olivier Gagnon	1d302a0320	doc typo	2021-10-15 13:19:00 -04:00
hydroflame	b0fc197f2c	Merge pull request #1502 from danielyxie/dev ... Autocomplete feature.	2021-10-15 13:15:56 -04:00
Olivier Gagnon	d35bac1ace	Build autocomplete	2021-10-15 13:15:42 -04:00
hydroflame	e99ffcfe2b	Merge pull request #1501 from danielyxie/autocomplete ... Autocomplete	2021-10-15 13:13:04 -04:00
Olivier Gagnon	c1d4ced331	autocomplete	2021-10-15 13:12:18 -04:00
Olivier Gagnon	6b0e5416c4	wtf	2021-10-15 12:47:43 -04:00
Olivier Gagnon	745fb4fdf6	Merge branch 'dev' into autocomplete	2021-10-15 00:22:15 -04:00